Commit Graph

5 Commits

Author SHA1 Message Date
Calen Pennington
f30596c499 Merge branch 'master' into specific-error-handling
Conflicts:
	djangoapps/courseware/views.py
2012-05-17 11:39:21 -04:00
Calen Pennington
cc6e0c55c4 Cleaning up the envs/* files so that they will work with gunicorn_django 2012-05-17 11:18:32 -04:00
Calen Pennington
c6c53be2c1 Migrate changes to settings.py to envs/*.py settings files 2012-05-16 11:01:23 -04:00
Calen Pennington
2b7b9ada60 Make local file uploads work in dev environment 2012-05-04 14:44:50 -04:00
David Ormsbee
3a95e3f79f Moving settings2/ folder to envs/ 2012-04-02 14:15:44 -04:00