cms · 7fecf1f212c266f3fe6c01fdad6ee54d3a9537a1 · edx / edx-platform · GitLab

History Find file

Merge branch 'feature/btalbot/cms-settings' of github.com:MITx/mitx into · 7fecf1f2
```
feature/dhm/cms-settings

Conflicts:
	cms/static/sass/_settings.scss
	cms/templates/settings.html
```
Don Mitchell committed Nov 19, 2012
7fecf1f2

Name	Last commit	Last update
..
djangoapps		Loading commit data...
envs		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
.coveragerc		Loading commit data...
CHANGELOG.md		Loading commit data...
__init__.py		Loading commit data...
manage.py		Loading commit data...
urls.py		Loading commit data...