Merge branch 'develop' of github.com:matrix-org/synapse into erikj/invite_state
Showing
- CHANGES.rst 14 additions, 0 deletionsCHANGES.rst
- demo/start.sh 1 addition, 0 deletionsdemo/start.sh
- synapse/__init__.py 1 addition, 1 deletionsynapse/__init__.py
- synapse/api/auth.py 148 additions, 3 deletionssynapse/api/auth.py
- synapse/api/constants.py 0 additions, 11 deletionssynapse/api/constants.py
- synapse/app/homeserver.py 55 additions, 7 deletionssynapse/app/homeserver.py
- synapse/app/synctl.py 10 additions, 2 deletionssynapse/app/synctl.py
- synapse/config/_base.py 41 additions, 4 deletionssynapse/config/_base.py
- synapse/config/appservice.py 1 addition, 1 deletionsynapse/config/appservice.py
- synapse/config/captcha.py 1 addition, 1 deletionsynapse/config/captcha.py
- synapse/config/database.py 1 addition, 1 deletionsynapse/config/database.py
- synapse/config/key.py 1 addition, 1 deletionsynapse/config/key.py
- synapse/config/logger.py 15 additions, 1 deletionsynapse/config/logger.py
- synapse/config/metrics.py 5 additions, 3 deletionssynapse/config/metrics.py
- synapse/config/ratelimiting.py 1 addition, 1 deletionsynapse/config/ratelimiting.py
- synapse/config/registration.py 1 addition, 1 deletionsynapse/config/registration.py
- synapse/config/repository.py 1 addition, 1 deletionsynapse/config/repository.py
- synapse/config/saml2.py 1 addition, 1 deletionsynapse/config/saml2.py
- synapse/config/server.py 1 addition, 1 deletionsynapse/config/server.py
- synapse/config/tls.py 9 additions, 1 deletionsynapse/config/tls.py
Loading
Please register or sign in to comment