summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2017-01-07 04:00:42 +0000
committerMatthew Hodgson <matthew@matrix.org>2017-01-07 04:00:42 +0000
commit2f4b2f4783c608e27dba91e528d2c5a9032b0051 (patch)
treeead50f761654ce02404fed1f1c33afaebd6772f0 /synapse
parentMerge branch 'release-v0.18.7' into develop (diff)
downloadsynapse-2f4b2f4783c608e27dba91e528d2c5a9032b0051.tar.xz
gah, fix mangled merge of 0.18.7 into develop
Diffstat (limited to 'synapse')
-rw-r--r--synapse/events/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py

index 8c71aeb5e4..da9f3ad436 100644 --- a/synapse/events/__init__.py +++ b/synapse/events/__init__.py
@@ -43,7 +43,7 @@ class _EventInternalMetadata(object): returns a str with the name of the server this event is sent on behalf of. """ - return getattr(self, "get_send_on_behalf_of", None) + return getattr(self, "send_on_behalf_of", None) def _event_dict_property(key):