Merge branch 'bug-1442' into testserver-1260 testserver-1260
authorBernhard Fröhlich <bernhard@cacert.org>
Mon, 19 Nov 2018 22:40:15 +0000 (23:40 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Mon, 19 Nov 2018 22:40:15 +0000 (23:40 +0100)
commit9f8516aa511f46bbed2b862cb8009646e9dd0669
tree849f08574641d70513f8a405eae779d5820c3759
parent35199b7bb05951ec51c45ea650aaff632eab1147
parentd6ce5013d5388da971ea89282be3bb3ae2ba69cb
Merge branch 'bug-1442' into testserver-1260

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