merge migrations

proposals/migrations/0023_merge_20161019_2040.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2016-10-19 20:40
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0022_auto_20161019_1141'),
+        ('proposals', '0022_talk_plenary'),
+    ]
+
+    operations = [
+    ]