Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Nathan Victor 2017-07-27 10:23:08 -05:00
commit 18388689aa
3 changed files with 4 additions and 4 deletions

View File

@ -37,7 +37,7 @@ django-allauth==0.32.0
# from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg # from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg
{% else %} {% else %}
# Python-PostgreSQL Database Adapter # Python-PostgreSQL Database Adapter
psycopg2==2.7.1 psycopg2==2.7.3
{%- endif %} {%- endif %}
# Unicode slugification # Unicode slugification

View File

@ -6,7 +6,7 @@
# Python-PostgreSQL Database Adapter # Python-PostgreSQL Database Adapter
# If using Win for dev, this assumes Unix in prod # If using Win for dev, this assumes Unix in prod
# ------------------------------------------------ # ------------------------------------------------
psycopg2==2.7.1 psycopg2==2.7.3
{%- endif %} {%- endif %}
# WSGI Handler # WSGI Handler
@ -24,7 +24,7 @@ Collectfast==0.5.2
# Email backends for Mailgun, Postmark, SendGrid and more # Email backends for Mailgun, Postmark, SendGrid and more
# ------------------------------------------------------- # -------------------------------------------------------
django-anymail==0.11 django-anymail==0.11.1
{% if cookiecutter.use_sentry_for_error_reporting == "y" -%} {% if cookiecutter.use_sentry_for_error_reporting == "y" -%}
# Raven is the Sentry client # Raven is the Sentry client

View File

@ -4,7 +4,7 @@
{% if cookiecutter.windows == 'y' -%} {% if cookiecutter.windows == 'y' -%}
# Python-PostgreSQL Database Adapter # Python-PostgreSQL Database Adapter
# If using Win for dev, this assumes Unix in test/prod # If using Win for dev, this assumes Unix in test/prod
psycopg2==2.7.1 psycopg2==2.7.3
{%- endif %} {%- endif %}
coverage==4.4.1 coverage==4.4.1