Merge branch 'develop' into feature/django2

rowers/tests/test_urls.py

@@ -283,7 +283,7 @@ class URLTests(TestCase):
             for u in urls:
                 if u not in tested and 'rowers' in u and 'http' not in u and 'authorize' not in u and 'import' not in u and 'logout' not in u:
                     response2 = self.c.get(u)
-                    if response2.status_code not in [200,302]:
+                    if response2.status_code not in [200,302,301]:
                         print(len(tested))
                         print(response.templates[0].name)
                         print(url)
@@ -291,7 +291,7 @@ class URLTests(TestCase):
                         print(response2.status_code)
                     tested.append(u)
                     self.assertIn(response2.status_code,
-                                  [200,302])
+                                  [200,302,301])
                 else:
                     tested.append(u)
         

rowers/tests/testdata/emails/ATT00001.txt

@@ -0,0 +1,3 @@
+
+
+