diff options
author | Erik Johnston <erik@matrix.org> | 2017-09-19 11:07:45 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-09-19 11:07:45 +0100 |
commit | b5feaa5a494e7f3fb1a0607002df54e4f17d20da (patch) | |
tree | eae4a91e78c9215631fde08c69c4b2dd093c44e6 /setup.py | |
parent | Merge pull request #2430 from matrix-org/erikj/groups_profile_cache (diff) | |
parent | Fix overzealous kicking of guest users (#2453) (diff) | |
download | synapse-b5feaa5a494e7f3fb1a0607002df54e4f17d20da.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/groups_merged
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions