Merge branch 'master' into 518-branding

iandees · iandees · commit 8c44368a2dfe · 2018-07-22T15:47:25.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ addons:
 install:
   - pip install -U pipenv
   - pipenv install --dev --system --deploy
+cache: pip
 env:
   global:
   - FLASK_APP: wsgi.py
diff --git a/app/templates/email/carpool_cancelled.txt b/app/templates/email/carpool_cancelled.txt
@@ -1,7 +1,7 @@
 Hello {{ rider.name }},
 
 Unfortunately, the carpool from {{ carpool.from_place }} to {{ carpool.destination.name }} at {{ carpool.leave_time | humanize }} has been cancelled.
-{{% if is_driver %}}
+{% if is_driver %}
 
 This carpool was cancelled by an administrator.
 
