From 687c1cf323d7f32d9b2e23e813df998acb7b0742 Mon Sep 17 00:00:00 2001
From: chirac <chirac@re2o-bcfg2.adm.crans.org>
Date: Sun, 24 Jun 2018 23:49:35 +0200
Subject: [PATCH] Merge depuis master

---
 machines/migrations/0087_merge_20180624_1648.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 machines/migrations/0087_merge_20180624_1648.py

diff --git a/machines/migrations/0087_merge_20180624_1648.py b/machines/migrations/0087_merge_20180624_1648.py
new file mode 100644
index 00000000..e3ce2faf
--- /dev/null
+++ b/machines/migrations/0087_merge_20180624_1648.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-06-24 21:48
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('machines', '0086_auto_20180624_1254'),
+        ('machines', '0082_auto_20180525_2209'),
+    ]
+
+    operations = [
+    ]