projects / oweals / karmaworld.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b42bb76 614fbce)
Merge branch 'master' of github.com:FinalsClub/karmaworld
authorCharles Holbrow <charlesholbrow@gmail.com>
Mon, 14 Jan 2013 19:44:41 +0000 (14:44 -0500)
committerCharles Holbrow <charlesholbrow@gmail.com>
Mon, 14 Jan 2013 19:44:41 +0000 (14:44 -0500)
1  2 
karmaworld/apps/notes/models.py patch | diff1 | diff2 | blob | history

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