Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 03:04:53 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into daniel/removesomelies

Browse source 
Conflicts:
	synapse/notifier.py
This commit is contained in:
Mark Haines 2015-11-04 16:01:00 +00:00
commit 33b3e04049
20 changed files with 580 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

2
synapse/notifier.py
View file

@ -270,7 +270,7 @@ class Notifier(object):
@defer.inlineCallbacks
def wait_for_events(self, user, timeout, callback,
from_token=StreamToken("s0", "0", "0", "0")):
from_token=StreamToken("s0", "0", "0", "0", "0")):
"""Wait until the callback returns a non empty response or the
timeout fires.
"""