ynerant 6f7374710b Merge branch 'master' into 'logging' ...

# Conflicts:
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po

2020-03-07 10:32:17 +01:00

..

__init__.py

Remove redundant ; and import local settings

2020-02-18 13:03:58 +01:00

base.py

Merge branch 'master' into 'logging'

2020-03-07 10:32:17 +01:00

development.py

Client CAS

2020-02-22 23:44:24 +01:00

production.py

Client CAS

2020-02-22 23:44:24 +01:00