commit 208b49cd91ec64aaff623dfeef08d352beab6785 Merge: bca6496 8b4a087 Author: Philipp Winter <phw@nymity.ch> Date: Tue Apr 7 10:33:22 2020 -0700 Merge branch 'defect/30941' into develop bridgedb/i18n/templates/bridgedb.pot | 11 +++++------ bridgedb/strings.py | 4 +--- 2 files changed, 6 insertions(+), 9 deletions(-)