Chris Dodge 3b5e17ef55 Merge branch 'master' into feature/cdodge/cms-master-merge2 ...

Conflicts:
	.gitmodules
	common/djangoapps/__init__.py
	common/djangoapps/track/migrations/__init__.py
	common/lib/capa/capa/inputtypes.py
	common/lib/capa/capa/responsetypes.py
	common/lib/capa/capa/templates/openendedinput.html
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/video_module.py
	common/static/sass/bourbon/css3/_box-sizing.scss
	doc/development.md
	lms/djangoapps/instructor/tests.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/templates/video.html
	requirements.txt
	test-requirements.txt

2013-01-07 12:34:48 -05:00

..

_about_pages.scss

Added social links to the footer of the press release

2012-07-23 19:17:22 -04:00

_course_about.scss

Some edits for the resources box

2012-09-07 09:49:43 -04:00

_courses.scss

Changed around the css

2012-07-23 12:38:21 -04:00

_dashboard.scss

Update news releases images

2012-11-19 13:06:37 -05:00

_edge.scss

styled edge registration form

2012-10-12 11:18:55 -04:00

_error-pages.scss

Changed around the css

2012-07-23 12:38:21 -04:00

_help.scss

Added bottom margin for articles in help

2012-07-23 19:19:50 -04:00

_home.scss

media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text

2013-01-04 10:02:14 -05:00

_jobs.scss

Update Job Page with new positions

2012-10-24 20:30:54 -04:00

_media-kit.scss

media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text

2013-01-04 10:02:14 -05:00

_password_reset.scss

Changed around the css

2012-07-23 12:38:21 -04:00

_press_release.scss

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00