Merge branch 'develop' of github.com:matrix-org/synapse into neilj/mau_tracker
No related branches found
No related tags found
Showing
- AUTHORS.rst 4 additions, 1 deletionAUTHORS.rst
- Dockerfile 19 additions, 3 deletionsDockerfile
- changelog.d/2952.bugfix 1 addition, 0 deletionschangelog.d/2952.bugfix
- changelog.d/3384.misc 1 addition, 0 deletionschangelog.d/3384.misc
- changelog.d/3543.misc 1 addition, 0 deletionschangelog.d/3543.misc
- changelog.d/3569.bugfix 1 addition, 0 deletionschangelog.d/3569.bugfix
- changelog.d/3612.misc 1 addition, 0 deletionschangelog.d/3612.misc
- changelog.d/3628.misc 1 addition, 0 deletionschangelog.d/3628.misc
- changelog.d/3630.feature 1 addition, 0 deletionschangelog.d/3630.feature
- changelog.d/3634.misc 1 addition, 0 deletionschangelog.d/3634.misc
- contrib/docker/README.md 1 addition, 7 deletionscontrib/docker/README.md
- contrib/docker/docker-compose.yml 1 addition, 0 deletionscontrib/docker/docker-compose.yml
- synapse/api/auth.py 2 additions, 2 deletionssynapse/api/auth.py
- synapse/api/errors.py 1 addition, 0 deletionssynapse/api/errors.py
- synapse/app/homeserver.py 19 additions, 0 deletionssynapse/app/homeserver.py
- synapse/config/server.py 8 additions, 0 deletionssynapse/config/server.py
- synapse/federation/federation_server.py 0 additions, 4 deletionssynapse/federation/federation_server.py
- synapse/federation/send_queue.py 1 addition, 62 deletionssynapse/federation/send_queue.py
- synapse/federation/transaction_queue.py 5 additions, 27 deletionssynapse/federation/transaction_queue.py
- synapse/federation/transport/server.py 2 additions, 3 deletionssynapse/federation/transport/server.py
Loading
Please register or sign in to comment