Chris Dodge 5df23d15f2 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master ...

Conflicts:
	cms/djangoapps/contentstore/views/course.py

2013-05-14 10:57:11 -04:00

..

djangoapps

Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master

2013-05-14 10:57:11 -04:00

envs

Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master

2013-05-13 15:47:33 -04:00

static

Merge pull request #1980 from edx/backbone-1.0.0

2013-05-09 09:34:35 -07:00

templates

more copy tweaks

2013-05-11 16:16:30 -04:00

__init__.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

.coveragerc

Change coverage report config to reflect refactoring of terrain files

2013-02-20 09:53:12 -05:00

CHANGELOG.md

Add changelog information

2012-11-06 10:34:51 -05:00

manage.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00

one_time_startup.py

remove discussion cache, which isn't used

2013-04-05 15:27:50 -04:00

urls.py

Making linters happier

2013-05-03 15:08:28 -04:00

xmodule_namespace.py

Remove duplicated StringyX definitions.

2013-04-24 14:59:32 -04:00