Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_list_speed
Showing
- contrib/example_log_config.yaml 4 additions, 2 deletionscontrib/example_log_config.yaml
- synapse/api/constants.py 0 additions, 2 deletionssynapse/api/constants.py
- synapse/app/appservice.py 1 addition, 1 deletionsynapse/app/appservice.py
- synapse/app/client_reader.py 1 addition, 1 deletionsynapse/app/client_reader.py
- synapse/app/federation_reader.py 1 addition, 1 deletionsynapse/app/federation_reader.py
- synapse/app/federation_sender.py 1 addition, 1 deletionsynapse/app/federation_sender.py
- synapse/app/homeserver.py 3 additions, 1 deletionsynapse/app/homeserver.py
- synapse/app/media_repository.py 1 addition, 1 deletionsynapse/app/media_repository.py
- synapse/app/pusher.py 1 addition, 1 deletionsynapse/app/pusher.py
- synapse/app/synchrotron.py 1 addition, 1 deletionsynapse/app/synchrotron.py
- synapse/config/logger.py 54 additions, 21 deletionssynapse/config/logger.py
- synapse/federation/federation_server.py 10 additions, 158 deletionssynapse/federation/federation_server.py
- synapse/handlers/auth.py 7 additions, 25 deletionssynapse/handlers/auth.py
- synapse/handlers/device.py 34 additions, 0 deletionssynapse/handlers/device.py
- synapse/handlers/federation.py 197 additions, 5 deletionssynapse/handlers/federation.py
- synapse/handlers/identity.py 1 addition, 36 deletionssynapse/handlers/identity.py
- synapse/http/servlet.py 0 additions, 10 deletionssynapse/http/servlet.py
- synapse/python_dependencies.py 0 additions, 2 deletionssynapse/python_dependencies.py
- synapse/rest/client/v1/login.py 6 additions, 82 deletionssynapse/rest/client/v1/login.py
- synapse/rest/client/v2_alpha/account.py 20 additions, 94 deletionssynapse/rest/client/v2_alpha/account.py
Loading
Please register or sign in to comment