Calen Pennington 5011f60d45 Merge branch 'master' into anonymous_user ...

Conflicts:
	djangoapps/courseware/module_render.py
	djangoapps/courseware/modules/capa_module.py

2012-05-10 09:17:26 -04:00

..

circuit

Splitting files into subdirectories in preparation for merge

2012-03-19 11:10:44 -04:00

courseware

Merge branch 'master' into anonymous_user

2012-05-10 09:17:26 -04:00

simplewiki

Rename simplewiki settings file

2012-05-07 15:01:43 -04:00

static_template_view

Splitting files into subdirectories in preparation for merge

2012-03-19 11:10:44 -04:00

staticbook

Allow anonymous user access to the site. Requires guest_courses.xml and info/guest_updates.html to be set created in the data repository

2012-04-30 15:18:47 -04:00

student

Merge branch 'master' into anonymous_user

2012-05-08 13:54:57 -04:00

track

Splitting files into subdirectories in preparation for merge

2012-03-19 11:10:44 -04:00