Merge branch 'bug-1430' into testserver-stable testserver-stable
authorBernhard Fröhlich <bernhard@cacert.org>
Mon, 22 Oct 2018 20:06:53 +0000 (22:06 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Mon, 22 Oct 2018 20:06:53 +0000 (22:06 +0200)
commit75fe1d0bd22bc8a77ec837b2ee05abf3bd7452a6
tree5a7296063f4e58a3a75140149dc1e5af7c458b03
parentdabeff231f0de37ba3084d5d38fb493a5297e03a
parent4669a0cf4c03c5ed4910439b2f08f42171f4b677
Merge branch 'bug-1430' into testserver-stable

# Conflicts:
# includes/general.php
includes/general.php