summary refs log tree commit diff
path: root/synapse/rest/client/transactions.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-02-15 09:54:09 +0000
committerErik Johnston <erik@matrix.org>2017-02-15 09:54:09 +0000
commit738000971ea27c2b300048130f74769ba0e24477 (patch)
treeca06e70bf3ec9b4c4bb04e9b2d99c16a9cbd610b /synapse/rest/client/transactions.py
parentMerge branch 'master' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #1912 from matrix-org/markjh/roominitialsync (diff)
downloadsynapse-738000971ea27c2b300048130f74769ba0e24477.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/rest/client/transactions.py')
0 files changed, 0 insertions, 0 deletions