summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-03-22 10:19:53 +0000
committerErik Johnston <erik@matrix.org>2018-03-22 10:19:53 +0000
commiteb9fc021e302aa7a5c39902e056cc525328431f8 (patch)
tree9162c92d399494be5213ec24c6e547c42f40469a /synapse/state.py
parentMerge pull request #3015 from matrix-org/erikj/simplejson_replication (diff)
parentUpdate CHANGES.rst (diff)
downloadsynapse-eb9fc021e302aa7a5c39902e056cc525328431f8.tar.xz
Merge branch 'release-v0.27.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/state.py')
0 files changed, 0 insertions, 0 deletions