edx-platform

Files

Calen Pennington 029d8c8085 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py

2013-03-15 09:46:47 -04:00

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

2013-03-12 07:23:28 -04:00

2013-02-20 16:12:36 -05:00

2013-03-04 16:33:40 -05:00

_discussion-old.scss

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

_discussion.scss

pinning .1

2013-03-12 17:40:26 -04: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

merge out from master

2013-02-07 17:40:54 -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