Julian Arni bc25defd10 Merge branch 'master' into feature/jkarni/jsinput ...

Conflicts:
	doc/public/index.rst

2013-06-24 10:46:19 -04:00

..

djangoapps

Remove the unused smart-accordion lettuce feature, and the code it used.

2013-06-21 16:30:33 -04:00

lib

Merge branch 'master' into feature/jkarni/jsinput

2013-06-24 10:46:19 -04:00

static

Merge branch 'master' into feature/jkarni/jsinput

2013-06-24 10:46:19 -04: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-20 16:55:37 -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