Peter Fogg 9c7be8b1dc Fix merge conflict in CHANGELOG.rst.

2013-06-20 09:58:22 -04:00

..

djangoapps

Merge pull request #205 from edx/christina/advanced-settings-test

2013-06-20 05:48:13 -07:00

lib

Fix merge conflict in CHANGELOG.rst.

2013-06-20 09:58:22 -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

Many changes to finish up PR. To wit:

2013-06-17 13:46:20 -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