Merge pull request #365 from nephila/merge/364

Merge #364
This commit is contained in:
Iacopo Spalletti 2017-05-07 02:54:44 +02:00 committed by GitHub
commit 3132e02c42

View file

@ -1,6 +1,9 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from distutils.version import LooseVersion
import cms
from cms.models import Page from cms.models import Page
from cms.utils.i18n import get_language_list from cms.utils.i18n import get_language_list
from django.db import migrations, models from django.db import migrations, models
@ -34,9 +37,15 @@ def backwards(apps, schema_editor):
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ if LooseVersion(cms.__version__) >= LooseVersion('3.1'):
('djangocms_blog', '0013_auto_20160201_2235'), dependencies = [
] ('cms', '0004_auto_20140924_1038'),
('djangocms_blog', '0013_auto_20160201_2235'),
]
else:
dependencies = [
('djangocms_blog', '0013_auto_20160201_2235'),
]
operations = [ operations = [
migrations.RunPython(forwards, backwards), migrations.RunPython(forwards, backwards),