summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-11-19 17:21:03 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-11-19 17:21:03 +0000
commitdd11bf8a795ed9c20ce694cd0cd12cf47c00fd25 (patch)
treef1647aaf46015d8da38d7ed1c6192cc835f13192 /synapse/federation
parentPut back the 'state.events' subobject (diff)
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-dd11bf8a795ed9c20ce694cd0cd12cf47c00fd25.tar.xz
Merge branch 'develop' into rav/flatten_sync_response
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions