summary refs log tree commit diff
path: root/synapse/app
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-08-24 17:00:37 +0100
committerErik Johnston <erik@matrix.org>2018-08-24 17:00:37 +0100
commit9db24769914f5c9a3081f549cbff92ef96042578 (patch)
tree5eb84f8afc267ba3af4199e3da3f9a4d17bbdb0b /synapse/app
parentNewsfile (diff)
parentMerge pull request #3756 from matrix-org/erikj/fix_tags_server_notices (diff)
downloadsynapse-9db24769914f5c9a3081f549cbff92ef96042578.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_contact
Diffstat (limited to 'synapse/app')
0 files changed, 0 insertions, 0 deletions