migrations merged

kfet/migrations/0049_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('kfet', '00048_kfet_open_cache'),
+        ('kfet', '0048_article_hidden'),
+    ]
+
+    operations = [
+    ]