Merge branch 'develop' of github.com:matrix-org/synapse into erikj/e2e_one_time_upsert
Showing
- README.rst 2 additions, 0 deletionsREADME.rst
- synapse/api/filtering.py 168 additions, 93 deletionssynapse/api/filtering.py
- synapse/app/client_reader.py 2 additions, 0 deletionssynapse/app/client_reader.py
- synapse/app/media_repository.py 2 additions, 0 deletionssynapse/app/media_repository.py
- synapse/crypto/keyring.py 16 additions, 23 deletionssynapse/crypto/keyring.py
- synapse/federation/federation_client.py 18 additions, 22 deletionssynapse/federation/federation_client.py
- synapse/federation/transaction_queue.py 96 additions, 121 deletionssynapse/federation/transaction_queue.py
- synapse/federation/transport/client.py 6 additions, 1 deletionsynapse/federation/transport/client.py
- synapse/handlers/directory.py 1 addition, 0 deletionssynapse/handlers/directory.py
- synapse/handlers/e2e_keys.py 12 additions, 20 deletionssynapse/handlers/e2e_keys.py
- synapse/handlers/presence.py 1 addition, 2 deletionssynapse/handlers/presence.py
- synapse/handlers/profile.py 4 additions, 2 deletionssynapse/handlers/profile.py
- synapse/http/matrixfederationclient.py 185 additions, 129 deletionssynapse/http/matrixfederationclient.py
- synapse/python_dependencies.py 1 addition, 0 deletionssynapse/python_dependencies.py
- synapse/replication/slave/storage/events.py 0 additions, 1 deletionsynapse/replication/slave/storage/events.py
- synapse/replication/slave/storage/presence.py 1 addition, 0 deletionssynapse/replication/slave/storage/presence.py
- synapse/rest/client/v2_alpha/account.py 1 addition, 1 deletionsynapse/rest/client/v2_alpha/account.py
- synapse/rest/client/v2_alpha/register.py 1 addition, 1 deletionsynapse/rest/client/v2_alpha/register.py
- synapse/storage/_base.py 14 additions, 11 deletionssynapse/storage/_base.py
- synapse/storage/account_data.py 2 additions, 2 deletionssynapse/storage/account_data.py
Loading
Please register or sign in to comment