Commit 4b05cdfd authored by Sofia Papagiannaki's avatar Sofia Papagiannaki
Browse files

merge with 0.6.4

parent d9dbe7b8
......@@ -614,4 +614,4 @@ class TimelineForm(forms.Form):
d['start_date'] = d['start_date'].strftime("%Y-%m-%dT%H:%M:%S.%f")
if 'end_date' in d:
d['end_date'] = d['end_date'].strftime("%%Y-%m-%dT%H:%M:%S.%f")
return d
\ No newline at end of file
return d
......@@ -51,8 +51,7 @@ from datetime import datetime
from functools import wraps
from astakos.im.settings import (DEFAULT_CONTACT_EMAIL, SITENAME, BASEURL,
LOGGING_LEVEL
)
LOGGING_LEVEL)
from astakos.im.models import AstakosUser
logger = logging.getLogger(__name__)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment