e0d d52b959ff1 fixing merge conflicts

2013-12-16 15:02:14 -05:00

..

djangoapps

Merge pull request #1941 from edx/diana/openid-fullname

2013-12-13 07:32:34 -08:00

lib

fixing merge conflicts

2013-12-16 15:02:14 -05:00

static

Revert "Merge pull request #1889 from tusbar/studio-https-fonts"

2013-12-16 09:30:42 -05:00

templates

remove unused jasmine resources

2013-11-07 12:04:35 -05:00

test

whitespace-only changes

2013-12-10 11:45:49 -05:00

.gitignore

Gitignore jasmine_test_runner.html in the appropriate place.

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

xml_cleanup.py

…