diff options
author | Erik Johnston <erik@matrix.org> | 2016-07-28 10:37:43 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-07-28 10:37:43 +0100 |
commit | 18e044628ed9cd6e034967e283784cf0a284a17d (patch) | |
tree | 497cc68775bc8d05883ce3eed901cec955dcfb83 /res/templates | |
parent | Bump CHANGES and version (diff) | |
parent | Merge pull request #961 from matrix-org/dbkr/fix_push_invite_name (diff) | |
download | synapse-18e044628ed9cd6e034967e283784cf0a284a17d.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'res/templates')
0 files changed, 0 insertions, 0 deletions