]> git.parisson.com Git - django_quiz.git/commitdiff
Merge branch 'master' of https://github.com/certifiedloud/django_quiz
authorCody Heimberger <rcodyheimberger@gmail.com>
Wed, 30 Jul 2014 22:04:50 +0000 (16:04 -0600)
committerCody Heimberger <rcodyheimberger@gmail.com>
Wed, 30 Jul 2014 22:04:50 +0000 (16:04 -0600)

Trivial merge