Merge remote-tracking branch 'origin/develop' into markjh/end-to-end-key-federation
No related branches found
No related tags found
Showing
- README.rst 47 additions, 45 deletionsREADME.rst
- demo/clean.sh 4 additions, 2 deletionsdemo/clean.sh
- demo/start.sh 11 additions, 9 deletionsdemo/start.sh
- setup.cfg 3 additions, 0 deletionssetup.cfg
- setup.py 1 addition, 1 deletionsetup.py
- synapse/api/auth.py 19 additions, 15 deletionssynapse/api/auth.py
- synapse/app/homeserver.py 2 additions, 1 deletionsynapse/app/homeserver.py
- synapse/config/_base.py 41 additions, 41 deletionssynapse/config/_base.py
- synapse/config/server.py 7 additions, 0 deletionssynapse/config/server.py
- synapse/handlers/identity.py 1 addition, 1 deletionsynapse/handlers/identity.py
- synapse/handlers/register.py 2 additions, 1 deletionsynapse/handlers/register.py
- synapse/http/matrixfederationclient.py 26 additions, 53 deletionssynapse/http/matrixfederationclient.py
- synapse/metrics/__init__.py 29 additions, 0 deletionssynapse/metrics/__init__.py
- synapse/python_dependencies.py 1 addition, 1 deletionsynapse/python_dependencies.py
- synapse/rest/client/v2_alpha/register.py 73 additions, 54 deletionssynapse/rest/client/v2_alpha/register.py
- synapse/rest/media/v1/base_resource.py 43 additions, 34 deletionssynapse/rest/media/v1/base_resource.py
- synapse/rest/media/v1/thumbnail_resource.py 2 additions, 1 deletionsynapse/rest/media/v1/thumbnail_resource.py
- synapse/storage/__init__.py 7 additions, 2 deletionssynapse/storage/__init__.py
- synapse/storage/_base.py 96 additions, 45 deletionssynapse/storage/_base.py
- synapse/storage/directory.py 2 additions, 2 deletionssynapse/storage/directory.py
Loading
Please register or sign in to comment