Rocky Duan 8228bebc2a Merge branch 'master' of github.com:MITx/mitx ...

Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/envs/common.py

2012-07-30 17:41:19 -04:00

..

admin

Moving LMS code into subdirectory

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

coffee

..and fix again bug caused by changing id

2012-07-30 17:25:14 -04:00

contrib

Moving LMS code into subdirectory

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

css

Merge branch 'master' of github.com:dementrock/mitx into discussion

2012-07-30 10:45:04 -04:00

fonts

Moving LMS code into subdirectory

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

images

Merge branch 'master' of github.com:MITx/mitx

2012-07-30 17:41:19 -04:00

images_old

Modularize sequence css

2012-07-24 16:14:04 -04:00

js

moved vendor js files to common

2012-07-25 20:57:38 -04:00

sass

Remove couse css file

2012-07-30 16:21:03 -04:00

staff

Moving LMS code into subdirectory

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

.gitignore

Added Gemfile.lock to ignore

2012-07-30 09:51:50 -04:00

.hgignore

Moving LMS code into subdirectory

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

green-pointer.png

Moving LMS code into subdirectory

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

pixel.jpg

Moving LMS code into subdirectory

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