diff --git a/app/migrations/0022_merge_20201011_1122.py b/app/migrations/0022_merge_20201011_1122.py
new file mode 100644
index 0000000000000000000000000000000000000000..4b0d5ebf263822713c41cced80792494eb749a21
--- /dev/null
+++ b/app/migrations/0022_merge_20201011_1122.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1 on 2020-10-11 04:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0021_dislikecomment_likecomment'),
+        ('app', '0021_materi_release_year'),
+    ]
+
+    operations = [
+    ]
diff --git a/digipus/__pycache__/settings.cpython-36.pyc b/digipus/__pycache__/settings.cpython-36.pyc
index 0857014007c24fe96681cc07b645936f81fe7ea1..bbd092036ce26932962c8c236860e7899ca31f6f 100644
Binary files a/digipus/__pycache__/settings.cpython-36.pyc and b/digipus/__pycache__/settings.cpython-36.pyc differ