Merge branch '1606837631-hotfix-migrations_conflict' into 'master'

1606837631-fix conflict on database migration

See merge request pmpl/class-project/kape!10

core/migrations/0015_merge_20191005_1926.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2019-10-05 12:26
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0014_feedback'),
+        ('core', '0014_company_category'),
+    ]
+
+    operations = [
+    ]

core/migrations/0016_merge_20191005_2235.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2019-10-05 15:35
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0015_merge_20191005_1926'),
+        ('core', '0015_merge_20191005_1957'),
+    ]
+
+    operations = [
+    ]