From e58f263dce6842b81b26216c822a08d15a3b8cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Wed, 19 Oct 2016 22:40:13 +0200
Subject: [PATCH] merge migrations

---
 proposals/migrations/0023_merge_20161019_2040.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 proposals/migrations/0023_merge_20161019_2040.py

diff --git a/proposals/migrations/0023_merge_20161019_2040.py b/proposals/migrations/0023_merge_20161019_2040.py
new file mode 100644
index 0000000..aa48ba9
--- /dev/null
+++ b/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 = [
+    ]