Merge branch 'master' into develop
Showing
- CHANGES.md 18 additions, 4 deletionsCHANGES.md
- debian/changelog 6 additions, 0 deletionsdebian/changelog
- synapse/__init__.py 1 addition, 1 deletionsynapse/__init__.py
- synapse/api/room_versions.py 1 addition, 1 deletionsynapse/api/room_versions.py
- synapse/config/experimental.py 1 addition, 1 deletionsynapse/config/experimental.py
- tests/rest/client/test_capabilities.py 2 additions, 2 deletionstests/rest/client/test_capabilities.py
Loading
Please register or sign in to comment