diff options
author | Erik Johnston <erik@matrix.org> | 2017-05-18 13:56:37 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-05-18 13:56:37 +0100 |
commit | f33df307324e0134635430a1a2d9c7c45e68cbb5 (patch) | |
tree | a0435aae03628d325a9b4ed82d0c74eb053afc61 /docs | |
parent | Merge pull request #2177 from matrix-org/erikj/faster_push_rules (diff) | |
parent | Merge branch 'release-v0.21.0' of github.com:matrix-org/synapse (diff) | |
download | synapse-f33df307324e0134635430a1a2d9c7c45e68cbb5.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions