diff options
| author | Erik Johnston <erik@matrix.org> | 2017-07-07 18:26:28 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-07-07 18:26:28 +0100 |
| commit | f467a8f66dac153428efa8c2b6296b84674a91ea (patch) | |
| tree | 100f3072b9a29af48f7ff55bea04f548702e1c9a /synapse/app | |
| parent | Merge pull request #2344 from matrix-org/erikj/frontend_proxy (diff) | |
| parent | Merge branch 'hotfixes-v0.22.1' of github.com:matrix-org/synapse (diff) | |
| download | synapse-f467a8f66dac153428efa8c2b6296b84674a91ea.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions