commit 7a42b973828dcab95a8d952ac0d549f2b3e99dea Merge: e6e02be 688e1ac Author: Philipp Winter <phw@nymity.ch> Date: Fri Jun 7 10:11:36 2019 -0700 Merge branch 'fix/28496' into develop CHANGELOG | 9 +++++++++ README.rst | 7 +++---- bridgedb.conf | 3 +-- bridgedb/distributors/https/templates/base.html | 3 +-- bridgedb/strings.py | 2 +- bridgedb/test/test_email_autoresponder.py | 2 +- 6 files changed, 16 insertions(+), 10 deletions(-)