Merge branch 'bug-1442' into testserver-1260
authorBernhard Fröhlich <bernhard@cacert.org>
Sun, 18 Nov 2018 20:04:57 +0000 (21:04 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Sun, 18 Nov 2018 20:04:57 +0000 (21:04 +0100)
commitd190cba9ceefd37acd94770f10ddb26d77b07b7e
tree7abe222a4af745d40bfc7613ef2eb2be8d67d45d
parent9bfcbee138087d343bc50aa7a5dd652a230add3b
parent4ff6326c74ec504126a6fb6946aa07a513a77599
Merge branch 'bug-1442' into testserver-1260

# Conflicts:
# includes/notary.inc.php
includes/notary.inc.php