projects / oweals / karmaworld.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff0b12b b3d96c6)
Merge branch 'master' into quizzes
authorCharles Connell <charles@connells.org>
Tue, 11 Feb 2014 22:25:18 +0000 (17:25 -0500)
committerCharles Connell <charles@connells.org>
Tue, 11 Feb 2014 22:25:18 +0000 (17:25 -0500)
1  2 
karmaworld/urls.py patch | diff1 | diff2 | blob | history
reqs/common.txt patch | diff1 | diff2 | blob | history

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