Felix Sun 93d457de54 Fixed epic git rebase meltdown. No new features.

2013-07-01 18:03:35 -04:00

..

djangoapps

Merge pull request #84 from edx/feature/jbau/activation-after-password-reset-confirm

2013-06-25 20:34:19 -07:00

lib

Fixed epic git rebase meltdown. No new features.

2013-07-01 18:03:35 -04:00

static

Working prototype of crowdsourced hinting module.

2013-07-01 18:03:35 -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