From: Charles Connell Date: Tue, 8 Apr 2014 21:33:29 +0000 (-0400) Subject: Merge branch 'master' into redesign X-Git-Tag: release-20150131~144^2~12 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=11535ba52648adcc57b28829b6bed3dab8bdca6e;p=oweals%2Fkarmaworld.git Merge branch 'master' into redesign 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 --- 11535ba52648adcc57b28829b6bed3dab8bdca6e