Jay Zoldak ed5ad46192 Revert "Revert "fix merge conflict"" ...

This reverts commit 2df3fe9344.

Conflicts:
	common/static/coffee/src/discussion/utils.coffee

2013-05-16 10:29:33 -04:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

Revert "Revert "fix merge conflict""

2013-05-16 10:29:33 -04:00

css

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

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

images

Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo

2013-04-30 13:34:52 -07:00

js

Updated Backbone.js and Underscore.js

2013-05-08 09:29:15 -04:00

sass

Studio: more styling changes

2013-05-14 17:16:53 -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