cahrens bc80779f6f Fix bug related to creation of thumbnails for non-image files. ...

https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2

2013-01-16 15:40:14 -05:00

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

Fix bug related to creation of thumbnails for non-image files.

2013-01-16 15:40:14 -05:00

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

jasmine_test_runner.html.erb

Merge with cms-master.

2013-01-07 09:59:08 -05:00

setup.py

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

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