Merge branch 'tiberiuichim-master' into testing

Merging into testing instead of master to make some changes before
bundling it into a patch.

1 files changed, 14 insertions, 0 deletions

diff --git a/weblog/migrations/0009_merge_20190104_2123.py b/weblog/migrations/0009_merge_20190104_2123.py
new file mode 100644
index 0000000..5c8ba71
--- /dev/null
+++ b/weblog/migrations/0009_merge_20190104_2123.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.1.3 on 2019-01-04 19:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('weblog', '0008_auto_20180329_1316'),
+        ('weblog', '0008_auto_20180531_0329'),
+    ]
+
+    operations = [
+    ]