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

author Gael Le Mignot <gael@pilotsystems.net>

Tue, 12 Dec 2017 09:32:19 +0000 (10:32 +0100)

committer Gael Le Mignot <gael@pilotsystems.net>

Tue, 12 Dec 2017 09:32:19 +0000 (10:32 +0100)
author Gael Le Mignot <gael@pilotsystems.net>
Tue, 12 Dec 2017 09:32:19 +0000 (10:32 +0100)
committer Gael Le Mignot <gael@pilotsystems.net>
Tue, 12 Dec 2017 09:32:19 +0000 (10:32 +0100)
diff --cc teleforma/models/core.py

index 3150587af220dd98b3f0093eb1ca8934b0e87963,c65fda698568dbca7d255f84fb7540d5e8dc8040..3150587af220dd98b3f0093eb1ca8934b0e87963

mode 100755,100644..100644
--- 1/teleforma/models/core.py
--- 2/teleforma/models/core.py
+++ b/teleforma/models/core.py
diff --cc teleforma/models/pro.py

index 8658726c57aa63dbc097b90d3d65947741d21b01,ef992902a0d0eb6c256a847471bff0aa3f337d61..8658726c57aa63dbc097b90d3d65947741d21b01

mode 100755,100644..100644
--- 1/teleforma/models/pro.py
--- 2/teleforma/models/pro.py
+++ b/teleforma/models/pro.py
author	Gael Le Mignot <gael@pilotsystems.net>
	Tue, 12 Dec 2017 09:32:19 +0000 (10:32 +0100)
committer	Gael Le Mignot <gael@pilotsystems.net>
	Tue, 12 Dec 2017 09:32:19 +0000 (10:32 +0100)
		1	2
teleforma/models/core.py	patch \|	diff1 \|	diff2 \|	blob \| history
teleforma/models/pro.py	patch \|	diff1 \|	diff2 \|	blob \| history