projects
/
oweals
/
karmaworld.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fd4290e
5c79a70
)
Merge branch 'master' of github.com:FinalsClub/karmaworld
author
Charles Holbrow
<charlesholbrow@gmail.com>
Tue, 19 Mar 2013 17:01:41 +0000
(13:01 -0400)
committer
Charles Holbrow
<charlesholbrow@gmail.com>
Tue, 19 Mar 2013 17:01:41 +0000
(13:01 -0400)
1
2
karmaworld/templates/courses/course_list.html
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
karmaworld/templates/courses/course_list.html
Simple merge