commit f23c0213bb1f1e030eaae5d1ac2b26d2a91244e4 Merge: ef9ea5c bdf192d Author: Philipp Winter phw@nymity.ch Date: Wed Mar 18 10:37:54 2020 -0700

Merge branch 'enhancement/33008' into develop

CHANGELOG | 5 + bridgedb/distributors/https/server.py | 13 ++- bridgedb/distributors/https/templates/base.html | 4 +- bridgedb/distributors/https/templates/info.html | 40 ++++++++ bridgedb/i18n/templates/bridgedb.pot | 128 ++++++++++++++++++++---- bridgedb/strings.py | 41 ++++++++ 6 files changed, 207 insertions(+), 24 deletions(-)