Merge branch 'develop' of github.com:matrix-org/synapse into erikj/backfill_fixes
Showing
- CHANGES.rst 6 additions, 0 deletionsCHANGES.rst
- scripts/register_new_matrix_user 3 additions, 2 deletionsscripts/register_new_matrix_user
- synapse/__init__.py 1 addition, 1 deletionsynapse/__init__.py
- synapse/app/homeserver.py 5 additions, 2 deletionssynapse/app/homeserver.py
- synapse/appservice/__init__.py 3 additions, 3 deletionssynapse/appservice/__init__.py
- synapse/config/metrics.py 5 additions, 1 deletionsynapse/config/metrics.py
- synapse/federation/federation_client.py 2 additions, 0 deletionssynapse/federation/federation_client.py
- synapse/federation/transaction_queue.py 20 additions, 11 deletionssynapse/federation/transaction_queue.py
- synapse/federation/transport/client.py 2 additions, 0 deletionssynapse/federation/transport/client.py
- synapse/federation/transport/server.py 8 additions, 0 deletionssynapse/federation/transport/server.py
- synapse/handlers/appservice.py 2 additions, 5 deletionssynapse/handlers/appservice.py
- synapse/handlers/presence.py 102 additions, 61 deletionssynapse/handlers/presence.py
- synapse/handlers/room.py 1 addition, 3 deletionssynapse/handlers/room.py
- synapse/http/matrixfederationclient.py 3 additions, 0 deletionssynapse/http/matrixfederationclient.py
- synapse/push/__init__.py 12 additions, 15 deletionssynapse/push/__init__.py
- synapse/storage/_base.py 6 additions, 0 deletionssynapse/storage/_base.py
- synapse/storage/event_federation.py 1 addition, 0 deletionssynapse/storage/event_federation.py
- synapse/storage/events.py 18 additions, 7 deletionssynapse/storage/events.py
- synapse/storage/push_rule.py 14 additions, 7 deletionssynapse/storage/push_rule.py
- synapse/storage/room.py 2 additions, 1 deletionsynapse/storage/room.py
Loading
Please register or sign in to comment