Kevin Chugh 5534d8bdce fix mega merge conflicts

2013-03-29 07:33:52 -04:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

fix mega merge conflicts

2013-03-29 07:33:52 -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 pull request #1589 from MITx/peter/symbolic

2013-03-27 10:40:50 -07:00

sass

studio - fixing a default mixin value used when defining font-size for elements

2013-03-21 12:21:02 -04:00

scripts

fix tests on merge

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