commit 74d1ec7547fe910a7dca1853229ca6afd8604fb8 Merge: 538895b 19403ca Author: Philipp Winter <phw@nymity.ch> Date: Tue Feb 4 11:12:53 2020 -0800 Merge branch 'fix/31427' into develop AUTHORS | 1 + CHANGELOG | 7 +++ README.rst | 5 +-- bridgedb/distributors/https/templates/base.html | 2 +- bridgedb/i18n/templates/bridgedb.pot | 60 +++++++++++++------------ bridgedb/strings.py | 8 ++-- doc/HACKING.md | 3 +- scripts/create_descriptors | 4 ++ 8 files changed, 54 insertions(+), 36 deletions(-)