Files · 1831ab4ea5b949e48714e1f26355f7cc41087758 · edx / edx-platform · GitLab

History Find file

Merge remote-tracking branch 'origin/master' into asset-pipeline · 1831ab4e

Conflicts:
	envs/dev.py
	sass/README
	static/css
	static/css/application.css
	static/css/marketing-ie.css
	static/css/marketing.css

committed May 17, 2012

Name	Last commit	Last update
djangoapps		Loading commit data...
envs		Loading commit data...
fixtures		Loading commit data...
lib		Loading commit data...
sass		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
test_root		Loading commit data...
.gitignore		Loading commit data...
.hgignore		Loading commit data...
Gemfile		Loading commit data...
Gemfile.lock		Loading commit data...
Guardfile		Loading commit data...
LICENSE.TXT		Loading commit data...
__init__.py		Loading commit data...
manage.py		Loading commit data...
pre-requirements.txt		Loading commit data...
rakefile		Loading commit data...
requirements.txt		Loading commit data...
settings.py		Loading commit data...
test-requirements.txt		Loading commit data...
urls.py		Loading commit data...