diff options
author | Erik Johnston <erik@matrix.org> | 2016-10-25 15:09:46 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-10-25 15:09:46 +0100 |
commit | 22fbf86e4f40d359b1f34f94139ac7c1959e1611 (patch) | |
tree | 473524275cf0c1852ef2e8ebe8fe581c0777b7a9 /res/templates/room.html | |
parent | Merge pull request #1179 from matrix-org/erikj/typing_timer_paranoia (diff) | |
parent | Fixup change log (diff) | |
download | synapse-22fbf86e4f40d359b1f34f94139ac7c1959e1611.tar.xz |
Merge branch 'release-v0.18.2' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'res/templates/room.html')
0 files changed, 0 insertions, 0 deletions