Diana Huang 2df3fe9344 Revert "fix merge conflict" ...

This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.

2013-04-26 12:40:35 -04:00

..

djangoapps

Move the testcenter login to external_auth

2013-04-25 11:12:19 -04:00

lib

Fix accidental force push that reset master

2013-04-26 10:50:53 -04:00

static

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

2013-03-11 11:27:49 -04:00

test

add a simple Studio walkthough to check page loads

2013-04-08 13:55:38 -04:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00