Matthew Mongeau 63fd5b57dd Fix _modal.scss merge conflicts.

2012-07-18 10:23:44 -04:00

..

askbot/skins

Add extra_filters_jinja needed for compressed_css filter

2012-07-10 16:22:05 -04:00

djangoapps

Moved enroll and course_about to courseware, because they depend on lms.

2012-07-17 17:09:20 -04:00

envs

Merge remote-tracking branch 'origin/master' into release/1.0

2012-07-17 13:56:44 -04:00

lib

Merge branch 'stable-edx4edx' of github.com:MITx/mitx

2012-07-08 16:52:36 -04:00

static

Fix _modal.scss merge conflicts.

2012-07-18 10:23:44 -04:00

templates

Style notice.

2012-07-18 10:11:06 -04:00

__init__.py

Moving LMS code into subdirectory

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

urls.py

Moved enroll and course_about to courseware, because they depend on lms.

2012-07-17 17:09:20 -04:00