Merge branch 'Develop' into tasks

# Conflicts: # cps/db.py
2020-08-25 00:15:41 -04:00
parent b81b8a1dea d89830af61
commit 6322919bc7
89 changed files with 2963 additions and 748 deletions
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -137,7 +137,7 @@ def send_registration_mail(e_mail, user_name, default_password, resend=False):
        taskMessage=_(u"Registration e-mail for user: %(name)s", name=user_name),
        text=text
    ))
-    
+
    return