Merge branch 'master' into aureplop/kpsul_js_refactor

Not chill.
This commit is contained in:
Aurélien Delobelle 2017-04-04 00:51:49 +02:00
commit 9d2298a089
173 changed files with 39741 additions and 16936 deletions

View file

@ -17,5 +17,7 @@ asgi-redis==0.14.0
statistics==1.0.3.5
future==0.15.2
django-widget-tweaks==1.4.1
git+https://git.eleves.ens.fr/cof-geek/django_custommail.git#egg=django_custommail
ldap3
git+https://github.com/Aureplop/channels.git#egg=channels
django-js-reverse==0.7.3