Kyle Fiedler 7f72004b50 Fix conflicts

2012-08-16 11:33:05 -04:00

..

askbot/skins

Added styles for single question and profile view

2012-08-15 13:51:10 -04:00

djangoapps

Fix conflicts

2012-08-16 11:33:05 -04:00

envs

Merge branch 'master' into kimth/xqueue_callback_blocking

2012-08-16 11:27:56 -04:00

lib

Moving a few static files out of lms into common

2012-08-07 13:39:59 -04:00

static

Added styles to grade out the top and bottom of the sidebar border and fixed spacing with the video and the sequence nav

2012-08-16 11:33:05 -04:00

templates

Merge pull request #425 from MITx/feature/bridger/new_wiki

2012-08-16 07:31:56 -07:00

__init__.py

Moving LMS code into subdirectory

2012-06-06 14:09:01 -04:00

urls.py

courseware.get_module passes down course_id triplet (org, course, run)

2012-08-15 14:20:35 -04:00