Calen Pennington 0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ...

Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py

2012-11-16 09:03:15 -05:00

..

djangoapps

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

lib

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

static

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-02 11:09:19 -04:00

templates

Make rake commands to run jasmine tests in browser and via phantomjs

2012-10-30 10:41:02 -04:00

test

Merge remote-tracking branch 'origin/master' into feature/cale/cms-master

2012-11-16 09:03:15 -05:00

xml_cleanup.py

{} -> {0} etc in .format statements

2012-08-16 16:22:26 -04:00