diff options
| author | Erik Johnston <erik@matrix.org> | 2015-09-15 16:35:34 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-09-15 16:35:34 +0100 |
| commit | 1107e83b5429e2465bcd52952154ba1ad01acd54 (patch) | |
| tree | 1e0af30cdf60e92faafb1cd6f903dc9c06ccd607 /synapse/server.py | |
| parent | Merge pull request #280 from matrix-org/paul/sighup (diff) | |
| parent | Bump version/changelog (diff) | |
| download | synapse-1107e83b5429e2465bcd52952154ba1ad01acd54.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/server.py')
0 files changed, 0 insertions, 0 deletions