lms/static/sass · 4fb8697dff17ec79748ea9fed47e8de48355d6c4 · edx / edx-platform

Merge remote-tracking branch 'origin/feature/nate/simple-chat' into… · 886c9880

Merge remote-tracking branch 'origin/feature/nate/simple-chat' into edx-west/release-candidate-20130613

Conflicts:
	lms/templates/courseware/accordion.html
	lms/templates/courseware/course_navigation.html
	lms/templates/courseware/progress.html
	lms/templates/navigation.html

committed Jun 13, 2013

886c9880

Name	Last commit	Last update
..
base		Loading commit data...
course		Loading commit data...
multicourse		Loading commit data...
shared		Loading commit data...
.gitignore		Loading commit data...
README.txt		Loading commit data...
_discussion-old.scss		Loading commit data...
_discussion.scss		Loading commit data...
_news.scss		Loading commit data...
_shame.scss		Loading commit data...
application.scss.mako		Loading commit data...
course.scss.mako		Loading commit data...
ie.scss		Loading commit data...

README.txt