Conflicts: envs/dev.py sass/README static/css static/css/application.css static/css/marketing-ie.css static/css/marketing.css
