commit b3cd9ac6d59a6f8ad1672518436d9e3d0ac2677f Merge: 681963d 61d86fb Author: Philipp Winter <phw@nymity.ch> Date: Mon Oct 21 08:42:34 2019 -0700 Merge branch 'task/32134' into develop CHANGELOG | 8 ++++ README.rst | 37 +++++++--------- bridgedb/i18n/templates/bridgedb.pot | 86 ++++++++++++++++++++---------------- bridgedb/strings.py | 6 ++- 4 files changed, 75 insertions(+), 62 deletions(-)