summary refs log tree commit diff
path: root/README.rst
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-03-15 17:44:39 +0000
committerMark Haines <mark.haines@matrix.org>2016-03-15 17:44:39 +0000
commit6df1c79c226c9207321122080fcc1d67f260aa3e (patch)
treeb6316d84c8ae70a23c071492cd608c8341ee7d3d /README.rst
parentHook up adding a pusher to the notifier for replication. (diff)
parentMerge pull request #646 from matrix-org/erikj/reject_invite_federation (diff)
downloadsynapse-6df1c79c226c9207321122080fcc1d67f260aa3e.tar.xz
Merge branch 'develop' into markjh/pushers_stream
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions