e0d 86e3391b41 fixing merge conflict from release

2013-12-19 16:34:25 -05:00

..

djangoapps

fixing merge conflict from release

2013-12-19 16:34:25 -05:00

lib

BLD-206: Add template for the zooming image in Studio.

2013-12-19 21:47:32 +02:00

static

BLD-506: Update behavior of start/end time fields.

2013-12-18 09:43:11 +02:00

templates

remove unused jasmine resources

2013-11-07 12:04:35 -05:00

test

whitespace-only changes

2013-12-10 11:45:49 -05:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

…