commit 984369897efd835bc40d39555b60f1618cd90525 Merge: c91498a 28a7e80 Author: Philipp Winter phw@nymity.ch Date: Wed Oct 16 09:57:07 2019 -0700

Merge branch 'fix/26543' into develop

AUTHORS | 3 +- CHANGELOG | 7 +++ bridgedb/_langs.py | 2 - bridgedb/distributors/https/server.py | 56 ++++++++++++++++++++-- .../https/templates/assets/css/main.css | 6 +++ bridgedb/distributors/https/templates/base.html | 17 ++++++- bridgedb/distributors/https/templates/bridges.html | 14 ++++-- bridgedb/distributors/https/templates/captcha.html | 2 +- bridgedb/distributors/https/templates/howto.html | 2 +- bridgedb/distributors/https/templates/index.html | 12 ++++- bridgedb/distributors/https/templates/options.html | 9 +++- bridgedb/i18n/templates/bridgedb.pot | 1 - bridgedb/test/test_https_server.py | 13 +++++ bridgedb/test/test_translations.py | 5 ++ bridgedb/translations.py | 34 +++++++++++-- setup.py | 4 +- 16 files changed, 165 insertions(+), 22 deletions(-)