summary refs log tree commit diff
path: root/README.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-08 16:52:09 +0100
committerErik Johnston <erik@matrix.org>2016-09-08 16:52:09 +0100
commit5c688739d68ea8d87a668115a32acaee222dc3ca (patch)
treeb93cea250a9a748c3f9e3931f4ed08e26043a5ed /README.rst
parentAdd delta file (diff)
parentMerge pull request #1084 from matrix-org/markjh/direct_to_device_wildcard (diff)
downloadsynapse-5c688739d68ea8d87a668115a32acaee222dc3ca.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/reindex_state_groups
Diffstat (limited to 'README.rst')
0 files changed, 0 insertions, 0 deletions