Merge branch 'fix-migration' into 'release/2.0'

Fix conflicting migrations

See merge request !172

aleksis/apps/chronos/migrations/0007_unique_constraints.py → aleksis/apps/chronos/migrations/0008_unique_constraints.py

@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('chronos', '0006_indexes'),
+        ('chronos', '0007_more_permissions'),
     ]
 
     operations = [