Peter Fogg 1d8d507f49 Merge in master (again).

2013-06-20 12:21:16 -04:00

..

djangoapps

pep8 fixes.

2013-06-20 10:31:44 -04:00

lib

Merge in master (again).

2013-06-20 12:21:16 -04:00

static

Merge branch 'master' into christina/course-settings-drupal

2013-06-20 11:00:12 -04: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