Merge branch '2.1.1' into release

ecds · Sep 13, 2021 · b4da20f · b4da20f
2 parents 579d825 + 7dad731
commit b4da20f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,10 @@
 
 CHANGELOG
 =========
+Release 2.1.1
+---------------------
+* Fixes migration conflicts
+
 Release 2.1.0
 ---------------------
 * Adds ingest

diff --git a/apps/custom_styles/migrations/0004_merge_20210913_1336.py b/apps/custom_styles/migrations/0004_merge_20210913_1336.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.23 on 2021-09-13 13:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('custom_styles', '0003_auto_20200730_1549'),
+        ('custom_styles', '0003_auto_20200730_1757'),
+    ]
+
+    operations = [
+    ]
diff --git a/apps/iiif/manifests/migrations/0019_merge_20210913_1336.py b/apps/iiif/manifests/migrations/0019_merge_20210913_1336.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.23 on 2021-09-13 13:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('manifests', '0018_auto_20210309_1840'),
+        ('manifests', '0010_auto_20200730_1549'),
+    ]
+
+    operations = [
+    ]
diff --git a/apps/readux/__init__.py b/apps/readux/__init__.py
@@ -1 +1 @@
-__version__ = '2.1.0'
+__version__ = '2.1.1'