Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
Showing
- CHANGES.rst 64 additions, 0 deletionsCHANGES.rst
- README.rst 1 addition, 1 deletionREADME.rst
- docs/admin_api/README.rst 12 additions, 0 deletionsdocs/admin_api/README.rst
- docs/admin_api/purge_history_api.rst 15 additions, 0 deletionsdocs/admin_api/purge_history_api.rst
- docs/admin_api/purge_remote_media.rst 19 additions, 0 deletionsdocs/admin_api/purge_remote_media.rst
- setup.cfg 2 additions, 4 deletionssetup.cfg
- synapse/__init__.py 1 addition, 1 deletionsynapse/__init__.py
- synapse/api/auth.py 15 additions, 13 deletionssynapse/api/auth.py
- synapse/app/__init__.py 3 additions, 5 deletionssynapse/app/__init__.py
- synapse/crypto/keyclient.py 9 additions, 3 deletionssynapse/crypto/keyclient.py
- synapse/crypto/keyring.py 84 additions, 70 deletionssynapse/crypto/keyring.py
- synapse/handlers/_base.py 7 additions, 6 deletionssynapse/handlers/_base.py
- synapse/handlers/auth.py 31 additions, 4 deletionssynapse/handlers/auth.py
- synapse/handlers/device.py 61 additions, 6 deletionssynapse/handlers/device.py
- synapse/handlers/profile.py 7 additions, 5 deletionssynapse/handlers/profile.py
- synapse/handlers/register.py 9 additions, 7 deletionssynapse/handlers/register.py
- synapse/handlers/room_member.py 9 additions, 11 deletionssynapse/handlers/room_member.py
- synapse/http/server.py 1 addition, 0 deletionssynapse/http/server.py
- synapse/push/emailpusher.py 2 additions, 3 deletionssynapse/push/emailpusher.py
- synapse/push/httppusher.py 2 additions, 1 deletionsynapse/push/httppusher.py
Loading
Please register or sign in to comment