]> git.parisson.com Git - django_quiz.git/commit
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)
commita0868624c228ff4d731e24dde2f0bc0aafc2106d
tree4ffda7cf9a92670426c0c67ae3b5d033a86fad5b
parentd72fd0f633a2c2063eff472b4c7074ce82c56a6e
parent84dc192f0ea9da7c6e42e765567b53884badbfaf
Merge pull request #1 from certifiedloud/master

merging master and dev branches