summary refs log tree commit diff
path: root/synapse/storage/state.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-07-17 10:56:55 +0100
committerErik Johnston <erik@matrix.org>2019-07-17 10:56:55 +0100
commit5299707329e1c5d6228605ca660800f6dc4cf20d (patch)
tree5277555c65670460cbd761698b1c920473d2835f /synapse/storage/state.py
parentMerge remote-tracking branch 'origin/release-v1.1.0' into matrix-org-hotfixes (diff)
parentMerge pull request #5597 from matrix-org/erikj/admin_api_cmd (diff)
downloadsynapse-5299707329e1c5d6228605ca660800f6dc4cf20d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/state.py')
0 files changed, 0 insertions, 0 deletions