Will Daly 342b3bb0e9 Merge branch 'master' into feature/will/ci-lettuce-tests ...

Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile

2013-05-16 11:21:59 -04:00

..

djangoapps

Merge branch 'master' into feature/will/ci-lettuce-tests

2013-05-15 11:40:54 -04:00

lib

Merge pull request #1961 from edx/feature/cale/maintain-dev-environment

2013-05-15 12:36:36 -07:00

static

Studio: more styling changes

2013-05-14 17:16:53 -04:00

templates

Fixed jasmine test issue with cms caused by previous change

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

test

Merge pull request #1991 from edx/feature/vik/oe-tests

2013-05-13 10:49:33 -07:00

xml_cleanup.py

Pep8 autofixes

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