Diana Huang 2df3fe9344 Revert "fix merge conflict" ...

This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.

2013-04-26 12:40:35 -04:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

Revert "fix merge conflict"

2013-04-26 12:40:35 -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

Grading works when sequence is loaded from saved state

2013-04-15 14:05:39 +02:00

sass

resolved local master merge conflicts with studio sass

2013-03-21 16:15:19 -04:00

scripts

fix tests on merge

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

.gitignore

Ignore compiled xmodule assets

2013-04-18 15:46:08 -04:00