Merge branch 'hotfixes-v0.10.0-r1' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2015-11-17 18:27:17 +00:00
commit a9770e5d24

View file

@ -491,6 +491,9 @@ class _JsonProducer(object):
def stopProducing(self): def stopProducing(self):
pass pass
def resumeProducing(self):
pass
def _flatten_response_never_received(e): def _flatten_response_never_received(e):
if hasattr(e, "reasons"): if hasattr(e, "reasons"):