Merge branch 'dev' into feature/webclass

author Guillaume Pellerin <guillaume.pellerin@ircam.fr>

Sun, 20 Jan 2019 20:41:19 +0000 (21:41 +0100)

committer Guillaume Pellerin <guillaume.pellerin@ircam.fr>

Sun, 20 Jan 2019 20:41:19 +0000 (21:41 +0100)
author Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Sun, 20 Jan 2019 20:41:19 +0000 (21:41 +0100)
committer Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Sun, 20 Jan 2019 20:41:19 +0000 (21:41 +0100)
diff --cc teleforma/models/core.py
Simple merge
diff --cc teleforma/models/crfpa.py

index da47ceb53190b4209d1880b2b4eea3c62d33319e,34ca3260afedfffc1ad574119f87a2917403b841..36a93a6b4e05c5b6dfdbae5e7a735a54ae6a44de

mode 100644,100755..100755
--- 1/teleforma/models/crfpa.py
--- 2/teleforma/models/crfpa.py
+++ b/teleforma/models/crfpa.py
author	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Sun, 20 Jan 2019 20:41:19 +0000 (21:41 +0100)
committer	Guillaume Pellerin <guillaume.pellerin@ircam.fr>
	Sun, 20 Jan 2019 20:41:19 +0000 (21:41 +0100)
		1	2
teleforma/models/core.py	patch \|	diff1 \|	diff2 \|	blob \| history
teleforma/models/crfpa.py	patch \|	diff1 \|	diff2 \|	blob \| history