diff options
author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:28:36 +0100 |
---|---|---|
committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:28:36 +0100 |
commit | ce2a7ed6e435cba44df386e718cdccecc119d333 (patch) | |
tree | aa73f75d9ba9c70fdbb18ecf6d9237889f154933 /synapse/server.py | |
parent | Merge branch 'develop' into auth (diff) | |
parent | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff) | |
download | synapse-ce2a7ed6e435cba44df386e718cdccecc119d333.tar.xz |
Merge branch 'develop' into auth
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions