diff options
author | Erik Johnston <erik@matrix.org> | 2015-01-30 14:09:32 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-01-30 14:09:32 +0000 |
commit | 2aaedab2033119efb8c22fc2941aa341ea1e9de9 (patch) | |
tree | 14fd6e4eda613a51dda6736e2e672add87a2f723 /README.rst | |
parent | Remove commented line (diff) | |
parent | We do need Twisted 14, not 15: we use internal Twisted things that have been ... (diff) | |
download | synapse-2aaedab2033119efb8c22fc2941aa341ea1e9de9.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolution
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions