Calen Pennington 801df37872 Merge remote-tracking branch 'origin/master' into arjun/javascript_response ...

Conflicts:
	common/lib/xmodule/xmodule/js/src/capa/display.coffee
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/module_render.py

2012-08-13 10:13:21 -04:00

..

coffee

Moving a few static files out of lms into common

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

css/vendor/ui-lightness

Fixed jquery ui image problem and added a base style sheet for lms to override fonts

2012-07-31 11:06:39 -04:00

images

added spinner class and image

2012-08-10 14:22:34 -04:00

js/vendor

Moving a few static files out of lms into common

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