merge with 0.6.4

snf-astakos-app/astakos/im/forms.py

@@ -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

snf-astakos-app/astakos/im/functions.py

@@ -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__)