From d5fff4b0be07b6537ff6e62cb5263757d7edb6f5 Mon Sep 17 00:00:00 2001
From: Gabriel Detraz <detraz@crans.org>
Date: Sat, 6 Jan 2018 20:32:23 +0100
Subject: [PATCH] Merge des migrations de preferences

---
 .../migrations/0027_merge_20180106_2019.py       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 preferences/migrations/0027_merge_20180106_2019.py

diff --git a/preferences/migrations/0027_merge_20180106_2019.py b/preferences/migrations/0027_merge_20180106_2019.py
new file mode 100644
index 00000000..68ce34fb
--- /dev/null
+++ b/preferences/migrations/0027_merge_20180106_2019.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-01-06 19:19
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0025_auto_20171231_2142'),
+        ('preferences', '0026_auto_20171216_0401'),
+    ]
+
+    operations = [
+    ]