Private
Public Access
1
0

Merge tag 'v6.81' into develop

releasing improved admin interface
This commit is contained in:
Sander Roosendaal
2018-06-03 08:13:49 +02:00
-2
View File
@@ -6165,7 +6165,6 @@ def user_boxplot_select(request,
'waterboattype':waterboattype, 'waterboattype':waterboattype,
} }
request.session['options'] = options request.session['options'] = options
print options
startdate = datetime.datetime.combine(startdate,datetime.time()) startdate = datetime.datetime.combine(startdate,datetime.time())
@@ -9086,7 +9085,6 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
startdatetime startdatetime
) )
print startdatetime
try: try:
# aware object can be in any timezone # aware object can be in any timezone
out = startdatetime.astimezone(pytz.utc) out = startdatetime.astimezone(pytz.utc)