Merge branch 'master' into revision-view

This commit is contained in:
Tom Price
2015-05-18 14:36:23 +01:00
14 changed files with 82 additions and 26 deletions

View File

@@ -7,6 +7,7 @@ dj-database-url==0.3.0
dj-static==0.0.6
django-debug-toolbar==1.2.2
django-ical==1.3
django-recaptcha==1.0.4
django-registration-redux==1.1
django-reversion==1.8.5
django-toolbelt==0.0.1