diff options
author | Richard van der Hoff <richard@matrix.org> | 2019-02-14 14:42:03 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2019-02-14 14:42:03 +0000 |
commit | b02465b9db25e13c25479787cb581ac3c83e20b3 (patch) | |
tree | d69714d864b5a87021f2fc0d2216321a8ec7f562 /synapse/app/homeserver.py | |
parent | Merge pull request #4450 from 14mRh4X0r/fix-dependency-message (diff) | |
parent | Merge tag 'v0.99.1' (diff) | |
download | synapse-b02465b9db25e13c25479787cb581ac3c83e20b3.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/app/homeserver.py')
0 files changed, 0 insertions, 0 deletions