Merge branch 'master' into aureplop/kpsul_js_refactor

This commit is contained in:
Aurélien Delobelle 2017-04-14 15:56:44 +02:00
commit b0d35667b3
20 changed files with 425 additions and 269 deletions

View file

@ -3,6 +3,7 @@ Django==1.8.*
django-autocomplete-light==2.3.3
django-autoslug==1.9.3
django-cas-ng==3.5.5
django-djconfig==0.5.3
django-grappelli==2.8.1
django-recaptcha==1.0.5
mysqlclient==1.3.7
@ -11,14 +12,14 @@ six==1.10.0
unicodecsv==0.14.1
icalendar==3.10
django-bootstrap-form==3.2.1
asgiref==0.14.0
daphne==0.14.3
asgi-redis==0.14.0
asgiref==1.1.1
daphne==1.2.0
asgi-redis==1.3.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
channels==1.1.3
django-js-reverse==0.7.3
python-dateutil