bc823d3bfe
Conflicts: djangoapps/multicourse/__init__.py requirements.txt sass/_info.scss sass/_textbook.scss sass/courseware/_sequence-nav.scss sass/courseware/_video.scss sass/index/_base.scss sass/index/_extends.scss sass/index/_footer.scss sass/index/_header.scss sass/index/_index.scss sass/index/_variables.scss sass/layout/_calculator.scss sass/print.scss static/css static/css/application.css static/css/marketing.css templates/main.html templates/marketing.html templates/sass/index/_base.scss templates/sass/index/_extends.scss templates/sass/index/_footer.scss templates/sass/index/_header.scss templates/sass/index/_index.scss templates/sass/index/_variables.scss templates/sass/marketing/_base.scss templates/sass/marketing/_extends.scss templates/sass/marketing/_footer.scss templates/sass/marketing/_header.scss templates/sass/marketing/_index.scss templates/sass/marketing/_variables.scss
Transitional for moving to new settings scheme. To use: django-admin.py runserver --settings=envs.dev --pythonpath=. NOTE: Using manage.py will automatically run mitx/settings.py first, regardless of what you send it for an explicit --settings flag. It still works, but might have odd side effects. Using django-admin.py avoids that problem. django-admin.py is installed by default when you install Django. To use with gunicorn_django in debug mode: gunicorn_django envs/dev.py