marco 290d049c29 Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui

2013-05-31 12:41:13 -04:00

..

admin

Pep8 autofixes

2013-02-06 11:13:50 -05:00

coffee

turn off notes js debugging

2013-05-06 19:35:41 -04:00

contrib

…

css/vendor

update annotator.min.css with change to fix adder button and serve the minified one.

2013-05-16 14:48:06 -04:00

files

Update edX media kit (LH #221)

2013-02-28 20:16:19 -05:00

fonts

…

images

Removed Symbolset font files

2013-05-30 16:09:17 -04:00

js

Restore /faq page, and moved new content to /help

2013-01-17 10:47:50 -05:00

maintenance

adding maintenance static data

2012-08-23 08:30:04 -04:00

sass

SASS variable and naming standards sync-up based on @talbs feedback completed

2013-05-31 12:40:40 -04:00

scripts

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

staff

…

.gitignore

…

.hgignore

…

green-pointer.png

…

pixel.jpg

…