Merge branch 'master' of github.com:pydanny/cookiecutter-django

This commit is contained in:
Audrey Roy Greenfeld 2015-09-23 23:53:48 -07:00
commit f06cb3c44f

View File

@ -1,5 +1,5 @@
{% if cookiecutter.use_python2 == 'n' -%} {% if cookiecutter.use_python2 == 'n' -%}
FROM python:3.4 FROM python:3.5
{% else %} {% else %}
FROM python:2.7 FROM python:2.7
{%- endif %} {%- endif %}