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

..

admin

Pep8 autofixes

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

coffee

Remove duplicate libraries used while jasmine testing the LMS (as they are also defined in vendor)

2013-04-30 14:09:42 -04:00

contrib

…

css/vendor

Standardize more of css between lms and cms

2012-10-01 15:17:40 -04:00

files

Update edX media kit (LH #221)

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

fonts

…

images

Revert "Revert "fix merge conflict""

2013-05-16 10:29:33 -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

Revert "Revert "fix merge conflict""

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

scripts

perform a new merge from master, resolve conflicts

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

staff

…

.gitignore

Added Gemfile.lock to ignore

2012-07-30 09:51:50 -04:00

.hgignore

…

green-pointer.png

…

pixel.jpg

…