]> git.parisson.com Git - django_quiz.git/commitdiff
projects / django_quiz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d72fd0f 84dc192)
Merge pull request #1 from certifiedloud/master
authorcertifiedloud <certifiedloud@gmail.com>
Thu, 31 Jul 2014 12:11:52 +0000 (06:11 -0600)
committercertifiedloud <certifiedloud@gmail.com>
Thu, 31 Jul 2014 12:11:52 +0000 (06:11 -0600)
merging master and dev branches


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.