diff options
author | Erik Johnston <erik@matrix.org> | 2016-01-27 17:22:35 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-01-27 17:22:35 +0000 |
commit | a955cbfa494be705a0f2eb1d2fb5cd3b8c481b6f (patch) | |
tree | 1ef745f393f8c1961da93ad6ad582829e9f1ea5b /CONTRIBUTING.rst | |
parent | PEP 8 (diff) | |
parent | Merge pull request #533 from matrix-org/rav/hashtest_federation (diff) | |
download | synapse-a955cbfa494be705a0f2eb1d2fb5cd3b8c481b6f.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup
Diffstat (limited to 'CONTRIBUTING.rst')
0 files changed, 0 insertions, 0 deletions