merge migration (granuban|master)

users/migrations/0060_merge_master_granuban.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-11-05 20:47
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0057_bantype_inhibited_services'),
+        ('users', '0059_auto_20171025_1854'),
+    ]
+
+    operations = [
+    ]