Merge branch 'release/v9.31'

2019-02-24 11:17:50 +01:00
parent 9092fc76f2 29108bc719
commit 1dbcd3ec31
3 changed files with 3 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ conftest.py

 # temporary test files
 /rowers/tests/testdata/temp
+/rowers/tests/testdata/testdata.csv.gz
 rowers/tests/testdata/testdata.csv.gz
 /rowers/tests/testdata/testdata.tcx

--- a/rowers/templates/paidplans.html
+++ b/rowers/templates/paidplans.html
@@ -140,8 +140,8 @@
          <tr>
            <td>Pricing</td>
            <td>FREE</td>
-            <td nowrap="nowrap">From 15&euro;/year</td>
-            <td nowrap="nowrap">From 65&euro;/year</td>
+            <td nowrap="nowrap">From 25&euro;/year</td>
+            <td nowrap="nowrap">From 75&euro;/year</td>
            <td nowrap="nowrap">From 90&euro;/year</td>
          </tr>
          <tr>
--- a/rowers/tests/testdata/testdata.csv.gz
+++ b/rowers/tests/testdata/testdata.csv.gz