Files · d9fcf7e78fc1c54d14071fb8a96c67eadac5aa20 · edx / edx-ora2 · GitLab

History Find file

Merge branch 'master' into sanchez/template-first-crack · d9fcf7e7
```
Conflicts:
	apps/openassessment/xblock/openassessmentblock.py
```
Stephen Sanchez committed Feb 18, 2014
d9fcf7e7

Name	Last commit	Last update
apps		Loading commit data...
doc		Loading commit data...
requirements		Loading commit data...
settings		Loading commit data...
.gitignore		Loading commit data...
.travis.yml		Loading commit data...
AUTHORS		Loading commit data...
LICENSE		Loading commit data...
MANIFEST.in		Loading commit data...
README.rst		Loading commit data...
TODO.md		Loading commit data...
manage.py		Loading commit data...
setup.py		Loading commit data...
urls.py		Loading commit data...