Merge branch 'develop' into feature/recipe

apps/establishment/migrations/0021_merge_20190919_0955.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-09-19 09:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('establishment', '0020_merge_20190917_1415'),
+        ('establishment', '0019_position_priority'),
+    ]
+
+    operations = [
+    ]

apps/main/migrations/0016_merge_20190919_0954.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-09-19 09:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0015_page'),
+        ('main', '0015_merge_20190918_1341'),
+    ]
+
+    operations = [
+    ]