summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-12 15:58:35 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-12 15:58:35 +0100
commitf4122c64b59d4c03da5d3383c8abc06a687d5da1 (patch)
treec557f43fd1e6320bd3cf1f0bfe89683f1b70921d /synapse/rest
parentRemove call to recently removed function in mock (diff)
parentMerge pull request #220 from matrix-org/markjh/generate_keys (diff)
downloadsynapse-f4122c64b59d4c03da5d3383c8abc06a687d5da1.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/rest')
0 files changed, 0 insertions, 0 deletions