From: Gael Le Mignot <gael@pilotsystems.net>
Date: Tue, 12 Dec 2017 09:32:19 +0000 (+0100)
Subject: Merge branch 'prodev' of git.parisson.com:git/teleforma into prodev
X-Git-Tag: 2.8.1-pro~216
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c30eb4aa21683b58d1141331e46f4711997372c0;p=teleforma.git

Merge branch 'prodev' of git.parisson.com:git/teleforma into prodev
---

c30eb4aa21683b58d1141331e46f4711997372c0
diff --cc teleforma/models/core.py
index 3150587a,c65fda69..3150587a
mode 100755,100644..100644
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
diff --cc teleforma/models/pro.py
index 8658726c,ef992902..8658726c
mode 100755,100644..100644
--- a/teleforma/models/pro.py
+++ b/teleforma/models/pro.py