diff options
author | Erik Johnston <erik@matrix.org> | 2017-05-17 13:11:43 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-05-17 13:11:43 +0100 |
commit | a8bc7cae56f352658609edfe50acee11cf9c2d74 (patch) | |
tree | 087ed0fa4d94132ce0230f5bc3f613f79fb4bfac /res/templates/room.txt | |
parent | Spelling (diff) | |
parent | Merge pull request #2229 from matrix-org/erikj/faster_get_joined (diff) | |
download | synapse-a8bc7cae56f352658609edfe50acee11cf9c2d74.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.21.0
Diffstat (limited to 'res/templates/room.txt')
0 files changed, 0 insertions, 0 deletions