projects / oweals / karmaworld.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79e5488 ce86815)
Merge branch 'master' of github.com:FinalsClub/karmaworld
authorSeth Woodworth <seth@sethish.com>
Wed, 6 Mar 2013 23:15:20 +0000 (18:15 -0500)
committerSeth Woodworth <seth@sethish.com>
Wed, 6 Mar 2013 23:15:20 +0000 (18:15 -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.