lms/static/sass/course/layout · a879b3ee3bd103ee96dd762dac37deb224486048 · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/release' into edx-west/release-candidate-20130711 · a879b3ee
```
Conflicts:
	cms/templates/widgets/header.html
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/courseware/tests/test_courses.py
```
Jason Bau committed Jul 11, 2013
a879b3ee

Name	Last commit	Last update
..
_calculator.scss		Loading commit data...
_chat.scss		Loading commit data...
_courseware_header.scss		Loading commit data...
_courseware_subnav.scss		Loading commit data...
_footer.scss		Loading commit data...
_timer.scss		Loading commit data...