Merge branch 'master' into Develop

# Conflicts: # cps/web.py # cps/worker.py
2019-04-14 18:18:39 +02:00
parent 2253708da7 55bdd13fb1
commit 4ae9d4a749
5 changed files with 21 additions and 12 deletions
@@ -272,6 +272,7 @@ class Anonymous(AnonymousUserMixin, UserBase):
        self.locale = data.locale
        self.mature_content = data.mature_content
        self.anon_browse = settings.config_anonbrowse
+        self.kindle_mail = data.kindle_mail

    def role_admin(self):
        return False