JonahStanley 0524ff53cc Merge branch 'master' into jonahstanley/add-courseteam-tests ...

Conflicts:
	cms/djangoapps/contentstore/features/common.py

2013-06-19 11:29:43 -04:00

..

djangoapps

Merge branch 'master' into jonahstanley/add-courseteam-tests

2013-06-19 11:29:43 -04:00

lib

Incidental pep8 changes

2013-06-18 17:25:06 -04:00

static

Merge pull request #181 from edx/renzo/segment-io-sequentials

2013-06-19 08:07:37 -07:00

templates

Abridge tests in light of learning how Segment.io works

2013-06-18 17:58:10 -04:00

test

Merge branch 'master' into jonahstanley/add-courseteam-tests

2013-06-17 16:43:56 -04:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

2013-05-16 12:39:48 -04:00

xml_cleanup.py

Pep8 autofixes

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