Files · 5011f60d451912e4b5e0b1d2c9dc23ae630a2cf2 · edx / edx-platform · GitLab

History Find file

Merge branch 'master' into anonymous_user · 5011f60d
```
Conflicts:
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/capa_module.py
```
Calen Pennington committed May 10, 2012
5011f60d

Name	Last commit	Last update
djangoapps		Loading commit data...
envs		Loading commit data...
fixtures		Loading commit data...
lib		Loading commit data...
static		Loading commit data...
templates		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...