Greg Price a0fb4d6c85 Merge branch 'master' into drupal-new ...

Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html

2013-05-10 10:30:10 -04:00

..

djangoapps

Merge branch 'master' into drupal-new

2013-05-10 10:30:10 -04:00

lib

Merge pull request #1965 from edx/feature/christina/fields

2013-05-08 10:32:55 -07:00

static

Updated Backbone.js and Underscore.js

2013-05-08 09:29:15 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

2013-03-11 11:27:49 -04:00

test

add a simple Studio walkthough to check page loads

2013-04-08 13:55:38 -04:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00