diff options
author | Erik Johnston <erik@matrix.org> | 2014-09-01 19:57:28 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-09-01 19:57:28 +0100 |
commit | f452899fe2a1bcf3f9d3313eeb108660b5cbf677 (patch) | |
tree | edae89fefddc1f820f5bcae8409a85c36f1b2a0e /synapse/__init__.py | |
parent | Fix the tests to include new db calls (diff) | |
parent | Merge branch 'server2server_tls' into develop (diff) | |
download | synapse-f452899fe2a1bcf3f9d3313eeb108660b5cbf677.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
Diffstat (limited to 'synapse/__init__.py')
0 files changed, 0 insertions, 0 deletions