Brian Talbot 714f69a57e studio - resolving merge conflicts in settings from a recent rebase

2013-02-13 09:07:53 -05:00

..

client_templates

studio - nav and soft landing various QA fixes

2013-02-12 17:03:48 -05:00

coffee

Add vendor files to files.json for the cms jasmine tests to work.

2013-01-31 13:48:38 -05:00

css

studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon

2013-01-22 23:32:51 -05:00

img

studio - soft landing: added in edX Studio logo

2013-02-05 14:14:14 -05:00

js

Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding

2013-02-12 16:57:00 -05:00

sass

studio - nav and soft landing various QA fixes

2013-02-12 17:36:36 -05:00