Yohann D'ANELLO 841d56d5b3 Merge remote-tracking branch 'origin/master' into activity ...

# Conflicts:
#	note_kfet/urls.py
#	templates/base.html

2020-03-27 00:32:22 +01:00

..

fixtures

move cas fixture to own file

2020-03-09 18:24:31 +01:00

settings

Merge branch 'master' into 'tresorerie'

2020-03-25 00:30:14 +01:00

__init__.py

and so it begins

2019-07-07 20:49:02 +00:00

middlewares.py

Implements permission masks

2020-03-19 16:12:52 +01:00

urls.py

Merge remote-tracking branch 'origin/master' into activity

2020-03-27 00:32:22 +01:00

wsgi.py

Unify file headers

2020-02-18 21:30:26 +01:00