Merge branch 'bug-1442' into testserver-1260
authorBernhard Fröhlich <bernhard@cacert.org>
Sun, 18 Nov 2018 14:39:37 +0000 (15:39 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Sun, 18 Nov 2018 14:39:37 +0000 (15:39 +0100)
commit9bfcbee138087d343bc50aa7a5dd652a230add3b
treee7ced052a76e4f69e1112c521f44000867729385
parent75fe1d0bd22bc8a77ec837b2ee05abf3bd7452a6
parent55fc69a5ce1dd3d227e172e55202061019d93430
Merge branch 'bug-1442' into testserver-1260

# Conflicts:
# includes/account.php
# includes/general.php
# includes/lib/general.php
# includes/loggedin.php
# includes/notary.inc.php
# pages/account/27.php
# pages/account/41.php
# pages/account/43.php
# pages/account/49.php
# pages/account/51.php
# pages/account/52.php
# pages/account/53.php
# pages/account/54.php
# pages/wot/1.php
# pages/wot/12.php
# pages/wot/13.php
# pages/wot/9.php
# stamp/certdet.php
# stamp/common.php
# stamp/displogo.php
# stamp/report.php
# tverify/index.php
# tverify/index/0.php
# www/ac.php
# www/account.php
# www/alert_hash_collision.php
# www/api/ccsr.php
# www/api/cemails.php
# www/api/edu.php
# www/disputes.php
# www/index.php
# www/verify.php
# www/wot.php
30 files changed:
includes/account.php
includes/account_stuff.php
includes/general.php
includes/general_stuff.php
includes/lib/account.php
includes/lib/general.php
includes/loggedin.php
includes/mysql.php.sample
includes/notary.inc.php
pages/account/13.php
pages/account/25.php
pages/account/27.php
pages/account/43.php
pages/account/49.php
pages/account/55.php
pages/account/6.php
pages/gpg/2.php
pages/wot/1.php
pages/wot/16.php
pages/wot/9.php
scripts/cron/refresh_stats.php
scripts/cron/updatesort.php
scripts/send_heartbleed.php
www/ac.php
www/account.php
www/cats/cats_import.php
www/gpg.php
www/index.php
www/stats.php
www/wot.php