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)
# Conflicts:
# includes/notary.inc.php

1  2 
includes/notary.inc.php

Simple merge