commit f25943ef8aabf8cc2b9b5bdfb32b422c2d4960ef Merge: cc3277b 9ac52d5 Author: Philipp Winter phw@nymity.ch Date: Thu May 14 14:37:32 2020 -0700

Merge branch 'defect/31528' into develop

CHANGELOG | 2436 ++++++++++---------- README.rst | 12 +- bridgedb/distributors/https/server.py | 11 +- .../https/templates/assets/css/main.css | 4 +- bridgedb/distributors/https/templates/bridges.html | 13 +- .../distributors/https/templates/error-400.html | 30 + .../distributors/https/templates/error-500.html | 4 +- bridgedb/i18n/templates/bridgedb.pot | 29 +- bridgedb/test/test_https_server.py | 20 +- 9 files changed, 1253 insertions(+), 1306 deletions(-)