summary refs log tree commit diff
path: root/synapse/state.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-19 16:17:54 +0000
committerErik Johnston <erik@matrix.org>2015-11-19 16:17:54 +0000
commit8b5349c7bc28db2e47c80936233fd1e1ef757623 (patch)
tree79f164a2cde34f67bb43bf40ad5ea3489d849410 /synapse/state.py
parentMerge pull request #386 from matrix-org/markjh/rename_pud_to_account_data (diff)
parentMerge branch 'hotfixes-v0.11.0-r2' of github.com:matrix-org/synapse (diff)
downloadsynapse-8b5349c7bc28db2e47c80936233fd1e1ef757623.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/state.py')
0 files changed, 0 insertions, 0 deletions