Merge remote-tracking branch 'origin/bug-1431' into testserver-stable
authorBernhard Fröhlich <bernhard@cacert.org>
Wed, 16 May 2018 13:53:13 +0000 (15:53 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Wed, 16 May 2018 13:53:13 +0000 (15:53 +0200)
commitdabeff231f0de37ba3084d5d38fb493a5297e03a
treee248406898388c9f280b9d04bc3b8238933854b1
parent09377a033f8e5632248844e9938cecd25fa62550
parenta2ed046439e1047867aba62686d43d2e5fb9af44
Merge remote-tracking branch 'origin/bug-1431' into testserver-stable
www/gpg.php