Bridger Maxwell 2f4cf23b73 Merge remote-tracking branch 'origin/master' into course_start ...

Conflicts:
	common/djangoapps/student/views.py

2012-07-17 12:53:27 -04:00

..

test_files

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

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

tests

Fixing github_sync to work with multiple course data directories

2012-07-10 14:58:27 -04:00

xmodule

Merge remote-tracking branch 'origin/master' into course_start

2012-07-17 12:53:27 -04:00

progress.py

Make xmodule fit the typical python installation setup

2012-07-02 13:19:27 -04:00

setup.py

Make it clear that the module for backwards compatability is just that

2012-07-11 22:19:34 -04:00