David Ormsbee 52d33c0dee Merge branch 'master' into ormsbee/verifyuser_func

2013-08-22 17:33:20 -04:00

..

djangoapps

Merge branch 'master' into ormsbee/verifyuser_func

2013-08-22 17:33:20 -04:00

lib

Merge pull request #652 from edx/feature/ichuang/import-with-no-static

2013-08-22 11:05:02 -07:00

static

Add jsinput_spec back in.

2013-08-21 13:54:22 -04:00

templates

very stupid initial photo verification attempt save just so we can stuff into a cart

2013-08-22 14:54:29 -04:00

test

Merge pull request #652 from edx/feature/ichuang/import-with-no-static

2013-08-22 11:05:02 -07:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…