Merge remote-tracking branch 'origin/release-v1.8.0' into develop
Showing
- changelog.d/6563.bugfix 1 addition, 0 deletionschangelog.d/6563.bugfix
- changelog.d/6657.bugfix 1 addition, 0 deletionschangelog.d/6657.bugfix
- synapse/rest/key/v2/remote_key_resource.py 8 additions, 22 deletionssynapse/rest/key/v2/remote_key_resource.py
- synapse/storage/data_stores/main/__init__.py 2 additions, 2 deletionssynapse/storage/data_stores/main/__init__.py
- tests/rest/admin/test_admin.py 41 additions, 0 deletionstests/rest/admin/test_admin.py
- tests/rest/key/__init__.py 0 additions, 0 deletionstests/rest/key/__init__.py
- tests/rest/key/v2/__init__.py 0 additions, 0 deletionstests/rest/key/v2/__init__.py
- tests/rest/key/v2/test_remote_key_resource.py 131 additions, 4 deletionstests/rest/key/v2/test_remote_key_resource.py
Loading
Please register or sign in to comment