commit 6d3e899925854b0994d66551fef25678e6f36561 Merge: c45439c 20f1049 Author: Philipp Winter <phw@nymity.ch> Date: Thu Jun 4 14:05:25 2020 -0700 Merge branch 'enhancement/19774' into develop CHANGELOG | 3 +++ .../https/templates/assets/images/favicon.ico | Bin 0 -> 4286 bytes bridgedb/distributors/https/templates/base.html | 1 + setup.py | 3 ++- 4 files changed, 6 insertions(+), 1 deletion(-)