projects / oweals / karmaworld.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6b17e8 5a21c16)
Merge branch 'master' into quizzes
authorCharles Connell <charles@connells.org>
Sun, 9 Feb 2014 21:31:36 +0000 (16:31 -0500)
committerCharles Connell <charles@connells.org>
Sun, 9 Feb 2014 21:31:36 +0000 (16:31 -0500)
Conflicts:
karmaworld/settings/dev.py

1  2 
reqs/common.txt patch | diff1 | diff2 | blob | history

diff --cc reqs/common.txt
Simple merge
Unnamed repository; edit this file 'description' to name the repository.