]> git.parisson.com Git - teleforma.git/commit
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)
commitdfe7e15b863e74388b5917bdcd6a129f055b43e9
tree5279b7b7e8da5b370e366d592ced75be65906c60
parent70eb24b01946063caafbb07f6b332aabb4d0102b
parent92128648acd0154d673e0ae56406a9f347cf8b22
Merge branch 'dj1.6' into feature/scores

Conflicts:
teleforma/exam/templates/exam/scripts.html
teleforma/exam/templates/exam/scripts.html
teleforma/exam/urls.py