Merge branch 'master' into nanterre-recette

zoo/zoo_data/migrations/0009_merge_20180201_1455.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.9 on 2018-02-01 13:55
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('zoo_data', '0008_auto_20180115_1141'),
+        ('zoo_data', '0008_auto_20180125_0939'),
+    ]
+
+    operations = [
+    ]