Merge remote-tracking branch 'upstream/develop' into develop

2014-12-10 11:26:19 +00:00 · 2014-12-10 11:26:19 +00:00 · 31939af387
commit 31939af387
parent f7576691b1 003be58ffe
31 changed files with 634 additions and 499 deletions
--- a/setup.py
+++ b/setup.py
@ -36,7 +36,7 @@ setup(
    ],
    include_package_data=True,
    install_requires=[
-        'django-parler>=1.1',
+        'django-parler>=1.2',
        'django-cms>=3.0',
        'django-taggit',
        'django-filer',
@ -49,6 +49,7 @@ setup(
        'cmsplugin-filer',
        'django-meta>=0.2',
        'django-meta-mixin>=0.1.1',
+	'south>=1.0.1',
    ],
    license="BSD",
    zip_safe=False,