summary refs log tree commit diff
path: root/synapse/streams
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-09-19 11:07:45 +0100
committerErik Johnston <erik@matrix.org>2017-09-19 11:07:45 +0100
commitb5feaa5a494e7f3fb1a0607002df54e4f17d20da (patch)
treeeae4a91e78c9215631fde08c69c4b2dd093c44e6 /synapse/streams
parentMerge pull request #2430 from matrix-org/erikj/groups_profile_cache (diff)
parentFix overzealous kicking of guest users (#2453) (diff)
downloadsynapse-b5feaa5a494e7f3fb1a0607002df54e4f17d20da.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged
Diffstat (limited to 'synapse/streams')
0 files changed, 0 insertions, 0 deletions