lms/envs · d0c06dda96191a383c5fab88d88dd667298b03e5 · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form · a5001bab
```
Conflicts:
	lms/static/sass/base/_grid-settings.scss
	lms/static/sass/shared/_footer.scss
	lms/static/sass/shared/_header.scss
```
Will Daly committed Nov 13, 2014
a5001bab

Name	Last commit	Last update
..
cms		Loading commit data...
devgroups		Loading commit data...
__init__.py		Loading commit data...
acceptance.py		Loading commit data...
aws.py		Loading commit data...
aws_migrate.py		Loading commit data...
bok_choy.auth.json		Loading commit data...
bok_choy.env.json		Loading commit data...
bok_choy.py		Loading commit data...
common.py		Loading commit data...
content.py		Loading commit data...
dev.py		Loading commit data...
dev_ike.py		Loading commit data...
dev_int.py		Loading commit data...
dev_with_worker.py		Loading commit data...
devplus.py		Loading commit data...
devstack.py		Loading commit data...
discussionsettings.py		Loading commit data...
edx4edx_aws.py		Loading commit data...
load_test.py		Loading commit data...
sauce.py		Loading commit data...
static.py		Loading commit data...
test.py		Loading commit data...