diff options
author | Mark Haines <mark.haines@matrix.org> | 2015-01-08 09:43:48 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2015-01-08 09:43:48 +0000 |
commit | 8ac9199f56b9472be450d7d605f454eccb8f2e50 (patch) | |
tree | 1155f31341e2a6add943ae5a9e65e695d3b475b5 /synapse/federation | |
parent | Log server version on startup (diff) | |
parent | Merge branch 'hotfixes-v0.6.1' (diff) | |
download | synapse-8ac9199f56b9472be450d7d605f454eccb8f2e50.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/federation')
0 files changed, 0 insertions, 0 deletions