summary refs log tree commit diff
path: root/docs/sphinx/README.rst
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2015-04-27 17:09:25 +0100
committerPaul "LeoNerd" Evans <paul@matrix.org>2015-04-27 17:09:25 +0100
commit38432d8c253fda453cd645491f46ef37714c4f7c (patch)
tree76d9f0dee077b01038a939f611fbcb4b89aea496 /docs/sphinx/README.rst
parentAlso remember to check 'invite' level for changes (diff)
parentMerge pull request #132 from matrix-org/observer_and_locks (diff)
downloadsynapse-38432d8c253fda453cd645491f46ef37714c4f7c.tar.xz
Merge branch 'develop' into invite_power_level
Diffstat (limited to 'docs/sphinx/README.rst')
0 files changed, 0 insertions, 0 deletions