Merge remote-tracking branch 'github/bug-1305' into test2-1260 test2-1260
authorBernhard Fröhlich <bernhard@cacert.org>
Fri, 18 Jan 2019 20:29:55 +0000 (21:29 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Fri, 18 Jan 2019 20:29:55 +0000 (21:29 +0100)
commita3cb4e655f4b53135acabaab9c0eb15aa0929a01
tree29d34a2555dba636f96410522cf54d2e4ae59fe9
parente62578a0961f12eb17e2c8b49b0533b058a372e8
parente6d9b5a8da7053051bc40a302e06a351a70b2f14
Merge remote-tracking branch 'github/bug-1305' into test2-1260

# Conflicts:
# pages/index/3.php
pages/index/3.php
www/cap.php
www/coap.html.php