]> git.parisson.com Git - django_quiz.git/commit
Merge branch 'master' of https://github.com/tomwalker/django-quiz
authortomwalker <tomwalker0472@gmail.com>
Thu, 7 Aug 2014 09:07:37 +0000 (10:07 +0100)
committertomwalker <tomwalker0472@gmail.com>
Thu, 7 Aug 2014 09:07:37 +0000 (10:07 +0100)
commite88262de91250a36030ea3c1c0df63478e6ea0c3
tree25164243041ae6a036725179a5c98dd25a30a675
parenta19aec9607700b07c923a1fd2ac01d6d49c2342a
parente3c1575e0118b7ce6eeb312181a80460fae42e63
Merge branch 'master' of https://github.com/tomwalker/django-quiz

Conflicts:
quiz/views.py
quiz/views.py