From: Tom Walker <tomwalker0472@gmail.com>
Date: Mon, 30 Jun 2014 19:22:31 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=860544b5640b054c6e970b25e38c9462813bcf18;p=django_quiz.git

Merge branch 'dev'

Conflicts:
	.gitignore
---

860544b5640b054c6e970b25e38c9462813bcf18
diff --cc .gitignore
index 99cf5ff,533eb5e..400b976
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,7 +1,6 @@@
  *.*~
 -*.*~
+ *.pyc
+ /db.sqlite3
+ /manage.py
+ /mysite*
+ /plan.txt