diff options
author | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-10-31 15:19:26 +0000 |
commit | cd581338cf2618d8480ce7ba6a2ffd4a5270b552 (patch) | |
tree | 533c0f5efcde3f06ea6e069c9d4ee8fb4f6ee231 /synapse/server.py | |
parent | Newsfile (diff) | |
parent | Merge pull request #6294 from matrix-org/erikj/add_state_storage (diff) | |
download | synapse-cd581338cf2618d8480ce7ba6a2ffd4a5270b552.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_purge_history
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions