Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.12.1
Showing
- jenkins.sh 3 additions, 3 deletionsjenkins.sh
- synapse/api/filtering.py 5 additions, 0 deletionssynapse/api/filtering.py
- synapse/app/homeserver.py 68 additions, 100 deletionssynapse/app/homeserver.py
- synapse/federation/__init__.py 2 additions, 7 deletionssynapse/federation/__init__.py
- synapse/federation/replication.py 0 additions, 2 deletionssynapse/federation/replication.py
- synapse/federation/transport/__init__.py 0 additions, 52 deletionssynapse/federation/transport/__init__.py
- synapse/federation/transport/client.py 4 additions, 0 deletionssynapse/federation/transport/client.py
- synapse/federation/transport/server.py 50 additions, 32 deletionssynapse/federation/transport/server.py
- synapse/handlers/federation.py 7 additions, 1 deletionsynapse/handlers/federation.py
- synapse/handlers/message.py 25 additions, 23 deletionssynapse/handlers/message.py
- synapse/handlers/sync.py 178 additions, 247 deletionssynapse/handlers/sync.py
- synapse/python_dependencies.py 1 addition, 1 deletionsynapse/python_dependencies.py
- synapse/rest/client/v1/push_rule.py 10 additions, 5 deletionssynapse/rest/client/v1/push_rule.py
- synapse/server.py 71 additions, 62 deletionssynapse/server.py
- synapse/storage/__init__.py 32 additions, 4 deletionssynapse/storage/__init__.py
- synapse/storage/_base.py 23 additions, 26 deletionssynapse/storage/_base.py
- synapse/storage/account_data.py 20 additions, 1 deletionsynapse/storage/account_data.py
- synapse/storage/events.py 11 additions, 9 deletionssynapse/storage/events.py
- synapse/storage/filtering.py 2 additions, 1 deletionsynapse/storage/filtering.py
- synapse/storage/push_rule.py 2 additions, 1 deletionsynapse/storage/push_rule.py
Loading
Please register or sign in to comment