Merge remote-tracking branch 'upstream/master' into standarize-images

2018-10-31 16:22:21 +02:00
parent 8a44a44688 9004c9b8b5
commit 903bb70c5b
17 changed files with 456 additions and 7 deletions
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -271,7 +271,7 @@ class User(Base, Email):
    @property
    def destination(self):
        if self.forward_enabled:
-            result = self.self.forward_destination
+            result = self.forward_destination
            if self.forward_keep:
                result += ',' + self.email
            return result