Calen Pennington dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	lms/static/sass/course/courseware/_courseware.scss

2012-11-13 10:22:42 -05:00

..

fixtures

Move module javascript into common/lib/xmodule. Still TODO: run jasmine tests in that directory

2012-07-24 16:13:59 -04:00

spec

Make javascript for video previews work correctly

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

src

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-13 10:22:42 -05:00