Calen Pennington 6d246f0685 Merge remote-tracking branch 'origin/master' into ps-cms-backbone ...

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/coffee/unit.coffee
	cms/templates/index.html
	cms/templates/widgets/sequence-edit.html

2012-07-10 08:55:45 -04:00

..

__init__.py

Get the cms up to the point of rendering a template

2012-06-08 14:01:41 -04:00

common.py

Merge remote-tracking branch 'origin/master' into ps-cms-backbone

2012-07-10 08:55:45 -04:00

dev.py

Only use the for_cms branch for development purposes

2012-07-03 21:22:48 -04:00

test.py

Add tests for the core github_sync functionality

2012-07-05 11:54:43 -04:00