From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 28 May 2015 22:38:44 +0000 (+0200)
Subject: Merge branch 'dj1.6' into feature/scores
X-Git-Tag: 1.1~232^2~5
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=dfe7e15b863e74388b5917bdcd6a129f055b43e9;p=teleforma.git

Merge branch 'dj1.6' into feature/scores

Conflicts:
	teleforma/exam/templates/exam/scripts.html
---

dfe7e15b863e74388b5917bdcd6a129f055b43e9