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

envs

Merge branch 'master' into drupal-new

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

lib

Hide the API key during logging.

2013-05-07 16:38:38 -04:00

static

Merge branch 'master' into drupal-new

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

templates

Merge branch 'master' into drupal-new

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

__init__.py

…

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:31:50 -05:00

CHANGELOG.md

Add comment about the target of change log entries

2012-10-30 16:48:47 -04:00

one_time_startup.py

ummm. forgot to commit stuff

2013-03-27 22:51:52 -04:00

urls.py

Merge branch 'master' into drupal-new

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

wsgi.py

…

xmodule_namespace.py

Remove duplicated StringyX definitions.

2013-04-24 14:59:32 -04:00