Merge branch 'dev' into sxw-dev

2024-09-21 08:23:20 +00:00 · 2015-08-06 16:47:59 +08:00 · 2015-08-06 16:47:59 +08:00 · 79360a1a56
commit 79360a1a56
parent 7d7b025a8b 58cf3d256f
2 changed files with 0 additions and 23 deletions
--- a/account/migrations/0004_auto_20150806_1251.py
+++ b/account/migrations/0004_auto_20150806_1251.py
@ -1,23 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('account', '0003_user_email'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='user',
-            name='admin_group',
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='admin_type',
-            field=models.IntegerField(default=0),
-        ),
-    ]
--- a/account/migrations/0004_auto_20150806_1645.py
+++ b/account/migrations/0004_auto_20150806_1645.py