Martin Pépin 2632c9dff8 Merge branch 'master' into Kerl/calendar		2016-07-29 20:17:04 +02:00
..
__init__.py	Commit gore : premier push vers git.eleves	2016-05-21 23:57:36 +02:00
settings_dev.py	Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/zolicss	2016-07-20 18:36:09 +02:00
urls.py	Merge branch 'master' into Kerl/calendar	2016-07-16 18:28:20 +02:00