Files · 162fa59441e1bb6dc6eb0074fd963a67a67d0eed · edx / edx-platform · GitLab

History Find file

Merge branch 'master' into pmitros/name-change · 162fa594
```
Conflicts:
	static/css/application.css
	static/css/marketing.css
```
Kyle Fiedler committed Mar 29, 2012
162fa594

Name	Last commit	Last update
djangoapps		Loading commit data...
fixtures		Loading commit data...
lib		Loading commit data...
settings2		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
.DS_Store		Loading commit data...
.gitignore		Loading commit data...
.hgignore		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...
urls.py		Loading commit data...