Diana Huang 4adf2f6180 Merge branch 'master' into diana/rubric-ui-improvements ...

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py

2013-02-06 13:16:24 -05:00

..

admin

Pep8 autofixes

2013-02-06 11:13:50 -05:00

coffee

Merge branch 'master' into diana/rubric-ui-improvements

2013-02-05 16:18:56 -05:00

contrib

Moving LMS code into subdirectory

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

css/vendor

Standardize more of css between lms and cms

2012-10-01 15:17:40 -04:00

files

Update media kit download (LH #168)

2013-01-27 17:50:53 -05:00

fonts

Moving LMS code into subdirectory

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

images

7.00x press release

2013-01-30 16:07:47 -05:00

js

Restore /faq page, and moved new content to /help

2013-01-17 10:47:50 -05:00

maintenance

adding maintenance static data

2012-08-23 08:30:04 -04:00

sass

Merge branch 'master' into diana/rubric-ui-improvements

2013-02-05 16:18:56 -05:00

scripts

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05: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