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)
1  2 
www/gpg.php

diff --cc www/gpg.php
Simple merge