diff options
author | Erik Johnston <erik@matrix.org> | 2015-07-21 09:25:30 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-07-21 09:25:30 +0100 |
commit | 90dbd71c13acf85b2a1c072f51532c32d5c7aa9d (patch) | |
tree | e67e413801924887b491969ec825c0c29c1b89b6 /synapse/federation | |
parent | s/take/claim/ for end to end key APIs (diff) | |
parent | typo (diff) | |
download | synapse-90dbd71c13acf85b2a1c072f51532c32d5c7aa9d.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions