projects
/
oweals
/
karmaworld.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
48ec225
8297e21
)
Merge branch 'master' into redesign
author
Charles Connell
<charles@connells.org>
Tue, 8 Apr 2014 21:33:29 +0000
(17:33 -0400)
committer
Charles Connell
<charles@connells.org>
Tue, 8 Apr 2014 21:33:29 +0000
(17:33 -0400)
Conflicts:
karmaworld/assets/js/course-detail.js
karmaworld/templates/courses/course_list_entry.html
karmaworld/templates/notes/note_list_entry.html
karmaworld/templates/notes/search_results.html
Trivial merge
projects / oweals / karmaworld.git / commitdiff