summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-03-15 16:08:46 +0000
committerErik Johnston <erik@matrix.org>2017-03-15 16:08:46 +0000
commitb6b1382be18bcbc5df4436f850fd12215165441d (patch)
tree3f1974d145bc22b12a962bcf18e50438c92d0b6a /synapse/state.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #2013 from matrix-org/erikj/presence_FASTER (diff)
downloadsynapse-b6b1382be18bcbc5df4436f850fd12215165441d.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/state.py')
0 files changed, 0 insertions, 0 deletions