diff options
author | Ben Banfield-Zanin <benbz@matrix.org> | 2020-10-15 14:38:01 +0100 |
---|---|---|
committer | Ben Banfield-Zanin <benbz@matrix.org> | 2020-10-15 14:38:01 +0100 |
commit | 57885709a7b8b9eb87c4d8e61e8f210b18103227 (patch) | |
tree | 8532607f2bf34565d817df82100a5b5ebb1f27bf /tests/module_api/test_api.py | |
parent | Accept a keycloak identity provider hint from the client and pass it through ... (diff) | |
parent | Remove racey assertion in MultiWriterIDGenerator (#8530) (diff) | |
download | synapse-57885709a7b8b9eb87c4d8e61e8f210b18103227.tar.xz |
Merge remote-tracking branch 'origin/release-v1.21.2' into toml/keycloak_hints
Diffstat (limited to 'tests/module_api/test_api.py')
-rw-r--r-- | tests/module_api/test_api.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/module_api/test_api.py b/tests/module_api/test_api.py |