Kyle Fiedler 162fa59441 Merge branch 'master' into pmitros/name-change ...

Conflicts:
	static/css/application.css
	static/css/marketing.css

2012-03-29 11:08:41 -04:00

..

circuit

Splitting files into subdirectories in preparation for merge

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

courseware

Moved from type to isinstance

2012-03-29 09:43:45 -04:00

simplewiki

Splitting files into subdirectories in preparation for merge

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

static_template_view

Splitting files into subdirectories in preparation for merge

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

staticbook

Splitting files into subdirectories in preparation for merge

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

student

Moved site, is_secure, etc. into render_to_string shortcut, and fixed bugs in the shortcut. We should test this pretty well, since this touches a lot of templates

2012-03-28 19:44:22 -04:00

track

Splitting files into subdirectories in preparation for merge

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