summary refs log tree commit diff
path: root/res
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-28 10:37:43 +0100
committerErik Johnston <erik@matrix.org>2016-07-28 10:37:43 +0100
commit18e044628ed9cd6e034967e283784cf0a284a17d (patch)
tree497cc68775bc8d05883ce3eed901cec955dcfb83 /res
parentBump CHANGES and version (diff)
parentMerge pull request #961 from matrix-org/dbkr/fix_push_invite_name (diff)
downloadsynapse-18e044628ed9cd6e034967e283784cf0a284a17d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.0
Diffstat (limited to 'res')
0 files changed, 0 insertions, 0 deletions