projects / oweals / karmaworld.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6de0c1a 49bc5a2)
Merge remote-tracking branch 'origin/master'
authorBryan <btbonval@gmail.com>
Mon, 6 Jan 2014 23:58:17 +0000 (18:58 -0500)
committerBryan <btbonval@gmail.com>
Mon, 6 Jan 2014 23:58:17 +0000 (18:58 -0500)
1  2 
karmaworld/apps/courses/models.py patch | diff1 | diff2 | blob | history

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