Merge branch 'bug-1444' into test2-1260
authorBernhard Fröhlich <bernhard@cacert.org>
Sun, 25 Nov 2018 20:59:14 +0000 (21:59 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Sun, 25 Nov 2018 20:59:14 +0000 (21:59 +0100)
commit9024f14b2b54b3f8b7bbda6e828b47bc590cc03f
tree899dd8b176cc000f61455a4ed5a9fbebc27698b7
parent883e644685fa4b14c14e731d443cd900cd500538
parentf5e17afc3540eccaaee33324b0b06b38003592c5
Merge branch 'bug-1444' into test2-1260

# Conflicts:
# includes/account_stuff.php
# includes/general_stuff.php
# pages/account/12.php
# pages/account/13.php
# pages/account/18.php
# pages/account/2.php
# pages/account/26.php
# pages/account/27.php
# pages/account/28.php
# pages/account/29.php
# pages/account/3.php
# pages/account/30.php
# pages/account/31.php
# pages/account/32.php
# pages/account/33.php
# pages/account/34.php
# pages/account/41.php
# pages/account/43.php
# pages/account/49.php
# pages/account/5.php
# pages/account/51.php
# pages/account/53.php
# pages/account/54.php
# pages/account/56.php
# pages/account/58.php
# pages/account/59.php
# pages/account/9.php
# pages/gpg/2.php
# pages/wot/10.php
# pages/wot/9.php
# www/rss.php
# www/sqldump.php
110 files changed:
includes/account.php
includes/account_stuff.php
includes/general.php
includes/general_stuff.php
includes/lib/general.php
includes/loggedin.php
includes/mysql.php.sample
includes/notary.inc.php
pages/account/12.php
pages/account/13.php
pages/account/15.php
pages/account/18.php
pages/account/19.php
pages/account/2.php
pages/account/22.php
pages/account/23.php
pages/account/25.php
pages/account/26.php
pages/account/27.php
pages/account/28.php
pages/account/29.php
pages/account/3.php
pages/account/30.php
pages/account/31.php
pages/account/32.php
pages/account/33.php
pages/account/34.php
pages/account/35.php
pages/account/41.php
pages/account/43.php
pages/account/49.php
pages/account/5.php
pages/account/51.php
pages/account/52.php
pages/account/53.php
pages/account/54.php
pages/account/55.php
pages/account/56.php
pages/account/57.php
pages/account/58.php
pages/account/59.php
pages/account/6.php
pages/account/9.php
pages/advertising/0.php
pages/gpg/2.php
pages/gpg/3.php
pages/wot/1.php
pages/wot/10.php
pages/wot/12.php
pages/wot/13.php
pages/wot/9.php
scripts/49de-lt2013-berlin-mail.php.txt
scripts/50de-ate-luebeck-mail.php.txt
scripts/51at-ate-graz-mail.php.txt
scripts/52at-ate-wien-mail.php.txt
scripts/53de-ate-amberg-mail.php.txt
scripts/54at-ate-linz-mail.php.txt
scripts/55de-ate-wiesbaden-mail.php.txt
scripts/56at-ate-oberwart-mail.php.txt
scripts/57at-ate-graz-mail.php.txt
scripts/58at-ate-wien-mail.php.txt
scripts/59de-ate-freiburg-mail.php.txt
scripts/60de-ate-bremen-mail.php.txt
scripts/61de-ate-dresden-mail.php.txt
scripts/62de-froscon2015-mail.php.txt
scripts/63dk-ate-nykobing-mail.php.txt
scripts/addpoints.php
scripts/assurer.php
scripts/consistence.php
scripts/country.php
scripts/cron/removedead.php
scripts/cron/updatesort.php
scripts/gpgcheck3.php
scripts/gpgfillmissingemail.php
scripts/gpgfillmissingkeyid.php
scripts/mailing archive/45au-ate-melbourne-mail.php.txt
scripts/mailing archive/46us-ate-raleigh-mail.php.txt
scripts/mailing archive/47us-fudcon-lawrence-mail.php.txt
scripts/mailing archive/48de-ate-kiel-mail.php.txt
scripts/mailing archive/oa01-allowance.php.txt
scripts/mailing archive/oa02-orgainformation.php.txt
scripts/mass-revoke.php
scripts/newsletter.php
scripts/newslettercebit.php
scripts/notify.php
scripts/oa03-csr_org_client_cert.php.txt
scripts/scanforexponents.php
scripts/send_thawte.php.txt
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/advertising.php
www/api/ccsr.php
www/api/cemails.php
www/api/edu.php
www/cats/cats_import.php
www/disputes.php
www/gpg.php
www/index.php
www/news.php
www/rss.php
www/sqldump.php
www/stats.php
www/verify.php
www/wot.php