Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql
No related branches found
No related tags found
Showing
- contrib/jitsimeetbridge/jitsimeetbridge.py 205 additions, 205 deletionscontrib/jitsimeetbridge/jitsimeetbridge.py
- setup.py 2 additions, 2 deletionssetup.py
- synapse/api/auth.py 8 additions, 3 deletionssynapse/api/auth.py
- synapse/api/errors.py 31 additions, 0 deletionssynapse/api/errors.py
- synapse/api/urls.py 1 addition, 0 deletionssynapse/api/urls.py
- synapse/app/homeserver.py 8 additions, 1 deletionsynapse/app/homeserver.py
- synapse/events/utils.py 6 additions, 6 deletionssynapse/events/utils.py
- synapse/handlers/events.py 38 additions, 33 deletionssynapse/handlers/events.py
- synapse/handlers/message.py 26 additions, 7 deletionssynapse/handlers/message.py
- synapse/handlers/presence.py 5 additions, 0 deletionssynapse/handlers/presence.py
- synapse/handlers/register.py 1 addition, 1 deletionsynapse/handlers/register.py
- synapse/handlers/room.py 5 additions, 2 deletionssynapse/handlers/room.py
- synapse/http/client.py 19 additions, 0 deletionssynapse/http/client.py
- synapse/http/server.py 2 additions, 6 deletionssynapse/http/server.py
- synapse/http/servlet.py 57 additions, 0 deletionssynapse/http/servlet.py
- synapse/push/__init__.py 364 additions, 0 deletionssynapse/push/__init__.py
- synapse/push/baserules.py 35 additions, 0 deletionssynapse/push/baserules.py
- synapse/push/httppusher.py 146 additions, 0 deletionssynapse/push/httppusher.py
- synapse/push/pusherpool.py 152 additions, 0 deletionssynapse/push/pusherpool.py
- synapse/python_dependencies.py 2 additions, 1 deletionsynapse/python_dependencies.py
Loading
Please register or sign in to comment