summary refs log tree commit diff
path: root/synapse/handlers/profile.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-10-02 14:39:30 +0100
committerErik Johnston <erik@matrix.org>2018-10-02 14:39:30 +0100
commit7fa156af8061397f425f23c159b5ef12bf20f830 (patch)
treed1ee85a8436de10c828e7394c1f1afee978ae952 /synapse/handlers/profile.py
parentMerge branch 'develop' into matrix-org-hotfixes (diff)
parentMerge pull request #3960 from matrix-org/rav/fix_missing_create_event_error (diff)
downloadsynapse-7fa156af8061397f425f23c159b5ef12bf20f830.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/profile.py')
-rw-r--r--synapse/handlers/profile.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py

index 75b8b7ce6a..f284d5a385 100644 --- a/synapse/handlers/profile.py +++ b/synapse/handlers/profile.py
@@ -278,7 +278,7 @@ class BaseProfileHandler(BaseHandler): except Exception as e: logger.warn( "Failed to update join event for room %s - %s", - room_id, str(e.message) + room_id, str(e) )