Merge remote-tracking branch 'origin/bug-1439' into testserver-stable
authorBernhard Fröhlich <bernhard@cacert.org>
Wed, 16 May 2018 13:51:19 +0000 (15:51 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Wed, 16 May 2018 13:51:19 +0000 (15:51 +0200)
# Conflicts:
# www/cats/cats_import.php

1  2 
www/cats/cats_import.php

Simple merge