Merge branch 'release-v0.10.1' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2015-10-23 11:11:56 +01:00
commit 259d10f0e4
8 changed files with 65 additions and 12 deletions

View file

@ -156,13 +156,7 @@ class ReceiptsHandler(BaseHandler):
if not result:
defer.returnValue([])
event = {
"type": "m.receipt",
"room_id": room_id,
"content": result,
}
defer.returnValue([event])
defer.returnValue(result)
class ReceiptEventSource(object):