Merge migrations.

evennia/comms/migrations/0012_merge_20170617_2017.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.2 on 2017-06-17 20:17
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comms', '0011_auto_20170606_1731'),
+        ('comms', '0011_auto_20170217_2039'),
+    ]
+
+    operations = [
+    ]