Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_requests
# Conflicts: # synapse/crypto/context_factory.py
Showing
- changelog.d/3316.feature 1 addition, 0 deletionschangelog.d/3316.feature
- changelog.d/3464.misc 0 additions, 0 deletionschangelog.d/3464.misc
- changelog.d/3496.feature 1 addition, 0 deletionschangelog.d/3496.feature
- changelog.d/3497.feature 1 addition, 0 deletionschangelog.d/3497.feature
- changelog.d/3498.misc 0 additions, 0 deletionschangelog.d/3498.misc
- changelog.d/3499.misc 0 additions, 0 deletionschangelog.d/3499.misc
- changelog.d/3501.misc 0 additions, 0 deletionschangelog.d/3501.misc
- changelog.d/3505.feature 1 addition, 0 deletionschangelog.d/3505.feature
- changelog.d/3521.feature 1 addition, 0 deletionschangelog.d/3521.feature
- changelog.d/3533.bugfix 1 addition, 0 deletionschangelog.d/3533.bugfix
- changelog.d/3534.misc 1 addition, 0 deletionschangelog.d/3534.misc
- changelog.d/3535.misc 0 additions, 0 deletionschangelog.d/3535.misc
- synapse/api/auth.py 66 additions, 65 deletionssynapse/api/auth.py
- synapse/api/errors.py 2 additions, 2 deletionssynapse/api/errors.py
- synapse/api/filtering.py 7 additions, 7 deletionssynapse/api/filtering.py
- synapse/api/urls.py 1 addition, 1 deletionsynapse/api/urls.py
- synapse/app/__init__.py 3 additions, 1 deletionsynapse/app/__init__.py
- synapse/app/_base.py 7 additions, 4 deletionssynapse/app/_base.py
- synapse/app/appservice.py 3 additions, 2 deletionssynapse/app/appservice.py
- synapse/app/client_reader.py 3 additions, 2 deletionssynapse/app/client_reader.py
Loading
Please register or sign in to comment