Merge branch '1706979461-hotfix' into 'master'

Fixed conflicting migrations

See merge request !51

app/migrations/0022_merge_20201011_1122.py

+# 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 = [
+    ]