diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-12 15:58:35 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-12 15:58:35 +0100 |
commit | f4122c64b59d4c03da5d3383c8abc06a687d5da1 (patch) | |
tree | c557f43fd1e6320bd3cf1f0bfe89683f1b70921d /synapse/appservice | |
parent | Remove call to recently removed function in mock (diff) | |
parent | Merge pull request #220 from matrix-org/markjh/generate_keys (diff) | |
download | synapse-f4122c64b59d4c03da5d3383c8abc06a687d5da1.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/appservice')
0 files changed, 0 insertions, 0 deletions