]> git.parisson.com Git - teleforma.git/commitdiff
Merge branch 'dj1.6' into feature/scores
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 28 May 2015 22:38:44 +0000 (00:38 +0200)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 28 May 2015 22:38:44 +0000 (00:38 +0200)
Conflicts:
teleforma/exam/templates/exam/scripts.html

1  2 
teleforma/exam/templates/exam/scripts.html
teleforma/exam/urls.py

Simple merge