Merge migrations

portal/migrations/0021_merge_20200115_1150.py

+# Generated by Django 2.0.13 on 2020-01-15 16:50
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('portal', '0019_auto_20200113_1537'),
+        ('portal', '0020_auto_20200114_1542'),
+    ]
+
+    operations = [
+    ]