projects
/
oweals
/
karmaworld.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
093fe46
76aa208
)
Merge branch 'master' of github.com:FinalsClub/karmaworld
author
Seth Woodworth
<seth@sethish.com>
Wed, 20 Mar 2013 02:39:26 +0000
(22:39 -0400)
committer
Seth Woodworth
<seth@sethish.com>
Wed, 20 Mar 2013 02:39:26 +0000
(22:39 -0400)
1
2
karmaworld/templates/courses/course_list.html
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
karmaworld/templates/courses/course_list.html
Simple merge