summary refs log tree commit diff
path: root/synapse/handlers/account_data.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-12 14:21:49 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-12 14:21:49 +0000
commitdeeebbfcb71d100cee18a8a26cc288a1cf352b83 (patch)
tree2948cf78c93d74ce1618a81c10ae497360e0af83 /synapse/handlers/account_data.py
parentMerge pull request #435 from matrix-org/erikj/search (diff)
parentMerge pull request #436 from matrix-org/markjh/pip_instructions (diff)
downloadsynapse-deeebbfcb71d100cee18a8a26cc288a1cf352b83.tar.xz
Merge branch 'release-v0.12.0' into develop
Diffstat (limited to 'synapse/handlers/account_data.py')
0 files changed, 0 insertions, 0 deletions