Rocky Duan eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge ...

Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html

2012-08-14 12:54:43 -07:00

..

_amplifier.scss

Moved files and removed files

2012-07-30 17:37:53 -04:00

_courseware.scss

Merge branch 'master' of github.com:MITx/mitx into merge

2012-08-14 12:54:43 -07:00

_sidebar.scss

Added tooltip styles, made all buttons the same, and other small changes throughout the courseware

2012-08-13 15:05:43 -04:00