Merge remote-tracking branch 'origin/release/0.8.x' into develop

This commit is contained in:
Iacopo Spalletti 2016-06-22 23:20:21 +02:00
commit 1ead29a68c
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
7 changed files with 14 additions and 14 deletions

View file

@ -30,7 +30,7 @@ setup(
'django-parler>=1.5',
'django-cms>=3.2',
'django-taggit>=0.12.2',
'django-filer>=1.2',
'django-filer>=1.1',
'pytz',
'django-taggit-templatetags',
'django-taggit-autosuggest',