commit 484422015af0fff03b515b7c08b64c78567e5d31 Merge: 5afd164 9c11754 Author: Philipp Winter phw@nymity.ch Date: Thu Mar 26 09:33:02 2020 -0700

Merge branch 'defect/30317' into develop

CHANGELOG | 5 +++ bridgedb/distributors/email/templates.py | 9 +---- bridgedb/distributors/https/templates/bridges.html | 20 ++++----- bridgedb/distributors/https/templates/howto.html | 20 ++++----- bridgedb/i18n/templates/bridgedb.pot | 47 +++++----------------- bridgedb/strings.py | 27 ++++--------- bridgedb/test/test_https_server.py | 8 ++-- 7 files changed, 44 insertions(+), 92 deletions(-)