Merge tag 'v5.69' into develop

bug fix time zone
2018-01-21 13:32:58 +01:00
parent 5f2ef40cc8 8cb5061b38
commit 9ae0f72c0f
1 changed files with 1 additions and 1 deletions
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -9385,7 +9385,7 @@ def workout_getc2workout_view(request,c2id):
            duration = datetime.datetime.strptime(duration,'%H:%M:%S.%f').time()

            try:
-                timezone_str = tz(data['timezone'])
+                timezone_str = data['timezone']
            except:
                timezone_str = 'UTC'