Merge branch 'master' into Kerl/calendar

This commit is contained in:
Martin Pépin 2016-07-29 20:17:04 +02:00
commit 2632c9dff8
58 changed files with 1564 additions and 488 deletions

View file

@ -11,3 +11,4 @@ simplejson==3.8.2
six==1.10.0
unicodecsv==0.14.1
icalendar==3.10
django-bootstrap-form==3.2.1