edx-platform

Files

Diana Huang 51db547a63 Merge branch 'master' into diana/rubric-ui-improvements

Conflicts:
	common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee

2013-02-05 16:18:56 -05:00

2013-01-22 16:31:42 -05:00

2013-02-05 16:18:56 -05:00

2013-01-17 20:30:22 -05:00

2013-01-15 15:42:09 -05:00

_discussion-old.scss

2012-08-29 13:22:55 -04:00

_discussion.scss

2012-10-12 04:54:56 -07:00

_news.scss

merge with origin master

2012-08-01 14:24:46 -04:00

.gitignore

2012-07-24 16:14:04 -04:00

application.scss

add

2013-01-27 17:18:55 -05:00

bourbon

2012-12-19 10:48:03 -05:00

course.scss

2013-02-04 09:11:28 -05:00

ie.scss

add

2013-01-27 17:19:12 -05:00

README.txt

2012-08-21 12:51:33 -04:00

Sass Watch:

sass --watch lms/static/sass:lms/static/sass -r ./lms/static/sass/bourbon/lib/bourbon.rb