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

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

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

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

.coveragerc

Make coverage reports only include code from the source directories

2012-11-08 12:25:12 -05:00

setup.py

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

2012-11-13 10:22:42 -05:00