FIX: conflict in settings.py
[myslice.git] / views / __init__.py
2013-03-14 Thierry Parmentelatforget about manage.py collectstatic and come up with...