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
..
fixtures	Add default initial fixture for CAS server	2020-02-27 14:00:20 +01:00
settings	Merge branch 'master' into 'logging'	2020-03-07 10:32:17 +01:00
__init__.py	and so it begins	2019-07-07 20:49:02 +00:00
middlewares.py	Remove SmoothNavigation Middleware	2020-02-21 21:15:49 +01:00
urls.py	Merge branch 'master' into 'logging'	2020-03-07 10:32:17 +01:00
wsgi.py	Unify file headers	2020-02-18 21:30:26 +01:00