Calen Pennington 029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py

2013-03-15 09:46:47 -04:00

..

applets/capa

Replace editamolecule input type applet with GWT version

2013-02-05 20:15:50 -05:00

coffee

added comment to explain sorting

2013-03-13 19:47:19 -04:00

css

use same images for prev/next as used in image-based textbooks

2013-02-26 16:43:48 -05:00

images

added partially correct icon from marco

2013-02-27 14:36:14 -05:00

js

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-15 09:46:47 -04:00

sass

studio - correcting an image-replacement Sass mixin

2013-02-13 09:18:23 -05:00

scripts

fix tests on merge

2013-01-04 10:32:31 -05:00