Merge branch 'master' into redesign
authorCharles Connell <charles@connells.org>
Thu, 13 Mar 2014 03:22:24 +0000 (23:22 -0400)
committerCharles Connell <charles@connells.org>
Thu, 13 Mar 2014 03:22:24 +0000 (23:22 -0400)
commitf5c4bc186e07c17b4ac02f761375540b3486bd86
treebba4c989d66abb9fa9efa11c9936c3f30ba43daa
parentf299d61aa183456426a9bf1194e5692d4076207b
parentf69e48e4e564a291f8fe19db7f4c6a41afe07998
Merge branch 'master' into redesign

Conflicts:
karmaworld/assets/css/global.css
karmaworld/assets/css/note_course_pages.css
karmaworld/apps/notes/models.py
karmaworld/assets/css/global.css
karmaworld/settings/common.py