Merge branch 'master' into hotfix/remove_basetitle
Showing
... | ... | @@ -3,7 +3,8 @@ django-localflavor==1.3 |
Pillow | ||
django-static-precompiler>=1.4,<2 | ||
django-sendfile==0.3.10 | ||
django-template-check # This should be in dev-requirements somehow | ||
django-template-check>=0.3.0 # This should be in dev-requirements somehow | ||
bleach==1.4.3 | ||
django-tinymce==2.3.0 | ||
pytz | ||
djangorestframework==3.4.4 |
website/events/api/urls.py
0 → 100644
website/members/api/urls.py
0 → 100644
No preview for this file type