Jens Langhammer d88283a7a9 Merge branch 'master' into pf4 ...

# Conflicts:
#	passbook/core/static/img/logos/discord.svg
#	passbook/core/static/js/passbook.js
#	passbook/core/templates/login/with_sources.html
#	passbook/core/templates/overview/index.html
#	passbook/core/views/authentication.py

2020-02-21 09:05:40 +01:00

..

administration

Merge branch 'master' into pf4

2020-02-21 09:05:40 +01:00

generic

admin: fix CodeMirror field not loading correctly

2020-02-17 21:02:35 +01:00