]> git.parisson.com Git - django_quiz.git/commit
Merge branch 'dev'
authorTom Walker <tomwalker0472@gmail.com>
Mon, 30 Jun 2014 19:22:31 +0000 (20:22 +0100)
committerTom Walker <tomwalker0472@gmail.com>
Mon, 30 Jun 2014 19:22:31 +0000 (20:22 +0100)
commit860544b5640b054c6e970b25e38c9462813bcf18
treec80298a2ef23f7ccf0b0508c5878b9cff44be54d
parentcacba2359fc01e27509b8e2f5028504847bccd35
parentdb96e343cb1427f77e9e4fcb1301ac79a8b0d160
Merge branch 'dev'

Conflicts:
.gitignore
.gitignore