Merge remote-tracking branch 'origin/master'

3c0e2736 · Weblate · 61302834 · 0c87784e · 3c0e2736
Commit 3c0e2736 authored Mar 04, 2016 by Weblate
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

weblate/accounts/migrations/0015_auto_20160304_1418.py weblate/accounts/migrations/0015_auto_20160304_1418.py +1 -1

No files found.
--- a/weblate/accounts/migrations/0015_auto_20160304_1418.py
+++ b/weblate/accounts/migrations/0015_auto_20160304_1418.py
@@ -10,7 +10,7 @@ import weblate.trans.fields
 class Migration(migrations.Migration):

    dependencies = [
-        ('auth', '0007_alter_validators_add_error_messages'),
+        ('auth', '0006_require_contenttypes_0002'),
        ('accounts', '0014_auto_20160302_1025'),
    ]