Merge branch 'develop' of github.com:matrix-org/synapse into erikj/createroom_content
Showing
- contrib/prometheus/README 18 additions, 1 deletioncontrib/prometheus/README
- contrib/prometheus/synapse-v1.rules 0 additions, 0 deletionscontrib/prometheus/synapse-v1.rules
- contrib/prometheus/synapse-v2.rules 60 additions, 0 deletionscontrib/prometheus/synapse-v2.rules
- docs/log_contexts.rst 0 additions, 4 deletionsdocs/log_contexts.rst
- docs/workers.rst 136 additions, 21 deletionsdocs/workers.rst
- scripts-dev/federation_client.py 34 additions, 8 deletionsscripts-dev/federation_client.py
- scripts/sync_room_to_group.pl 45 additions, 0 deletionsscripts/sync_room_to_group.pl
- synapse/api/auth.py 5 additions, 1 deletionsynapse/api/auth.py
- synapse/api/errors.py 16 additions, 0 deletionssynapse/api/errors.py
- synapse/app/homeserver.py 13 additions, 9 deletionssynapse/app/homeserver.py
- synapse/app/media_repository.py 8 additions, 2 deletionssynapse/app/media_repository.py
- synapse/app/synchrotron.py 1 addition, 2 deletionssynapse/app/synchrotron.py
- synapse/appservice/__init__.py 36 additions, 1 deletionsynapse/appservice/__init__.py
- synapse/config/appservice.py 1 addition, 0 deletionssynapse/config/appservice.py
- synapse/config/homeserver.py 2 additions, 1 deletionsynapse/config/homeserver.py
- synapse/config/push.py 30 additions, 14 deletionssynapse/config/push.py
- synapse/config/server.py 6 additions, 0 deletionssynapse/config/server.py
- synapse/config/user_directory.py 44 additions, 0 deletionssynapse/config/user_directory.py
- synapse/crypto/event_signing.py 10 additions, 3 deletionssynapse/crypto/event_signing.py
- synapse/federation/federation_client.py 2 additions, 2 deletionssynapse/federation/federation_client.py
Loading
Please register or sign in to comment