diff options
author | Erik Johnston <erik@matrix.org> | 2015-02-10 14:30:26 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-02-10 14:30:26 +0000 |
commit | 91f0e411533b2cd6b120d7f5fbe0c558a105bdcb (patch) | |
tree | b542074da8ec84541ad8dcb7b52db7e5aad66ba7 /synapse/federation | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into state-chache (diff) | |
parent | yaml.load expects strings to be a yaml rather than file (diff) | |
download | synapse-91f0e411533b2cd6b120d7f5fbe0c558a105bdcb.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into state-chache
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions