summary refs log tree commit diff
path: root/synapse/notifier.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@matrix.org>2018-07-23 19:21:37 +0100
committerMatthew Hodgson <matthew@matrix.org>2018-07-23 19:21:37 +0100
commitadfe29ec0bedf394772e30583c271f142bccd3ba (patch)
treeba4759be562a0f9f9cddc514968fd16e7b0faa90 /synapse/notifier.py
parentincorporate review (diff)
parentMerge pull request #3584 from matrix-org/erikj/use_cached (diff)
downloadsynapse-adfe29ec0bedf394772e30583c271f142bccd3ba.tar.xz
Merge branch 'develop' into matthew/filter_members
Diffstat (limited to 'synapse/notifier.py')
-rw-r--r--synapse/notifier.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index 51cbd66f06..e650c3e494 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -274,7 +274,7 @@ class Notifier(object):
             logger.exception("Error notifying application services of event")
 
     def on_new_event(self, stream_key, new_token, users=[], rooms=[]):
-        """ Used to inform listeners that something has happend event wise.
+        """ Used to inform listeners that something has happened event wise.
 
         Will wake up all listeners for the given users and rooms.
         """