Chris Dodge ebf6d74776 Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs ...

Conflicts:
	cms/static/js/base.js

2012-10-13 21:44:15 -04:00

..

djangoapps

Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs

2012-10-13 21:44:15 -04:00

envs

Make separate links for lms_preview and lms as needed

2012-10-12 15:03:06 -04:00

static

Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs

2012-10-13 21:44:15 -04:00

templates

Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs

2012-10-13 21:44:15 -04:00

__init__.py

Initial port of templates into filesystem based storage

2012-09-25 10:10:44 -04:00

manage.py

Fix string layout for readability

2012-06-21 10:59:45 -04:00

urls.py

wip: create new course

2012-10-12 16:11:55 -04:00