Brian Talbot d87c4e3866 resolving local merge with master

2013-04-03 15:01:55 -04:00

..

applets/capa

Replace editamolecule input type applet with GWT version

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

coffee

make pinning backward compatible

2013-03-15 12:38:28 -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 #1695 from MITx/jmclaus/genex-save-state

2013-04-02 07:58:17 -07: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