Merge remote-tracking branch 'matrix-org/develop' into travis/new-worker-docs
Showing
- CHANGES.rst 82 additions, 4 deletionsCHANGES.rst
- CONTRIBUTING.rst 7 additions, 3 deletionsCONTRIBUTING.rst
- README.rst 15 additions, 0 deletionsREADME.rst
- UPGRADE.rst 12 additions, 0 deletionsUPGRADE.rst
- docs/admin_api/purge_history_api.rst 40 additions, 4 deletionsdocs/admin_api/purge_history_api.rst
- docs/log_contexts.rst 4 additions, 4 deletionsdocs/log_contexts.rst
- docs/workers.rst 1 addition, 1 deletiondocs/workers.rst
- synapse/__init__.py 1 addition, 1 deletionsynapse/__init__.py
- synapse/api/errors.py 2 additions, 1 deletionsynapse/api/errors.py
- synapse/api/filtering.py 1 addition, 1 deletionsynapse/api/filtering.py
- synapse/app/appservice.py 2 additions, 2 deletionssynapse/app/appservice.py
- synapse/app/client_reader.py 2 additions, 3 deletionssynapse/app/client_reader.py
- synapse/app/event_creator.py 23 additions, 4 deletionssynapse/app/event_creator.py
- synapse/app/federation_reader.py 2 additions, 3 deletionssynapse/app/federation_reader.py
- synapse/app/federation_sender.py 2 additions, 2 deletionssynapse/app/federation_sender.py
- synapse/app/frontend_proxy.py 2 additions, 3 deletionssynapse/app/frontend_proxy.py
- synapse/app/homeserver.py 36 additions, 3 deletionssynapse/app/homeserver.py
- synapse/app/media_repository.py 2 additions, 3 deletionssynapse/app/media_repository.py
- synapse/app/pusher.py 2 additions, 7 deletionssynapse/app/pusher.py
- synapse/app/synchrotron.py 4 additions, 8 deletionssynapse/app/synchrotron.py
Loading
Please register or sign in to comment