summary refs log tree commit diff
path: root/tox.ini
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-03-02 16:43:33 +0000
committerRichard van der Hoff <richard@matrix.org>2020-03-02 16:43:33 +0000
commit27d099edd66ee41c92d3c4603777c0a2fa897cc4 (patch)
tree0412b1ec5c7a294f5f87aa5ce8eed1a56653ec1e /tox.ini
parentMerge branch 'anoabolivier/sso-confirm' into 'release-v1.11.1' (diff)
parentFixed set a user as an admin with the new API (#6928) (diff)
downloadsynapse-27d099edd66ee41c92d3c4603777c0a2fa897cc4.tar.xz
Merge remote-tracking branch 'origin/release-v1.11.1' into release-v1.11.1
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions