Merge branch 'master' of ssh://repos.entrouvert.org/passerelle-grandlyon-cartads

# Conflicts:
#	cartads/models.py

cartads/migrations/0007_remove_cartads_log_level.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.12 on 2018-11-19 13:53
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cartads', '0006_auto_20180528_1520'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='cartads',
+            name='log_level',
+        ),
+    ]