Brian Talbot cdcdfd49e0 studio - alerts: resolving local master merge conflcits

2013-03-18 10:58:16 -04:00

..

djangoapps

Make relative imports explicitly relative

2013-03-15 11:23:22 -04:00

lib

Mark snippets as raw strings to avoid having to escape backslashes

2013-03-15 11:52:50 -04:00

static

studio - alerts: resolving local master merge conflcits

2013-03-18 10:58:16 -04:00

templates

Merged, delete Ace.

2013-02-19 14:56:37 -05:00

test

fix test_conditional, add new conditional to "conditional_and_poll" test course

2013-03-06 19:52:18 +02:00

xml_cleanup.py

Pep8 autofixes

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