Merge branch 'release/0.8.x' into develop

This commit is contained in:
Iacopo Spalletti 2016-06-21 16:50:30 +02:00
commit 40302ab680
No known key found for this signature in database
GPG key ID: BDCBC2EB289F60C6
3 changed files with 9 additions and 4 deletions

View file

@ -30,12 +30,12 @@ setup(
'django-parler>=1.5',
'django-cms>=3.2',
'django-taggit>=0.12.2',
'django-filer',
'django-filer>=1.2',
'pytz',
'django-taggit-templatetags',
'django-taggit-autosuggest',
'djangocms-text-ckeditor',
'cmsplugin-filer',
'cmsplugin-filer>=1.0',
'django-meta>=1.2',
'django-meta-mixin>=0.3',
'aldryn-apphooks-config>=0.2.6',