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

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