summary refs log tree commit diff
path: root/synapse/rest/client/v2_alpha/thirdparty.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-09 11:12:31 +0100
committerErik Johnston <erik@matrix.org>2016-09-09 11:12:31 +0100
commit9bba6ebaa903a81cd94fada114aa71e20b685adb (patch)
tree4a8cc3cf739ea2be7b5dd126a6076e7b0f31336b /synapse/rest/client/v2_alpha/thirdparty.py
parentMerge branch 'release-v0.17.2' of github.com:matrix-org/synapse (diff)
parentBump changelog and version (diff)
downloadsynapse-9bba6ebaa903a81cd94fada114aa71e20b685adb.tar.xz
Merge branch 'release-v0.17.3' of github.com:matrix-org/synapse v0.17.3
Diffstat (limited to 'synapse/rest/client/v2_alpha/thirdparty.py')
0 files changed, 0 insertions, 0 deletions