Merge branch 'django' into django+add-role-viewset

1 files changed, 17 insertions, 0 deletions

diff --git a/api/migrations/0018_user_rename.py b/api/migrations/0018_user_rename.py
new file mode 100644
index 00000000..f88eb5bc
--- /dev/null
+++ b/api/migrations/0018_user_rename.py
@@ -0,0 +1,17 @@
+# Generated by Django 2.1.3 on 2018-11-19 20:09
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0017_auto_20181029_1921'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Member',
+            new_name='User',
+        ),
+    ]