Merge branch '315-conflicting-migrations-detected' into 'master'

Resolve "Conflicting migrations detected"

Closes #315

See merge request AlekSIS/official/AlekSIS!382

aleksis/core/migrations/0003_add_permissions_for_group_stats.py → aleksis/core/migrations/0004_add_permissions_for_group_stats.py

@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('core', '0002_school_term'),
+        ('core', '0003_drop_image_cropping'),
     ]
 
     operations = [