diff options
author | Brendan Abolivier <babolivier@matrix.org> | 2020-06-11 13:31:22 +0100 |
---|---|---|
committer | Brendan Abolivier <babolivier@matrix.org> | 2020-06-11 13:31:22 +0100 |
commit | 1ad06ee6ebc00d2d5120e54b0c6be1d46bf688bc (patch) | |
tree | b575778cef7734c76920b811a9160f46134259b5 /.gitignore | |
parent | Increase the default SAML session expirary time to 15 minutes. (#7664) (diff) | |
parent | 1.15.0 (diff) | |
download | synapse-1ad06ee6ebc00d2d5120e54b0c6be1d46bf688bc.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions