Merge branch 'develop' of github.com:matrix-org/synapse into erikj/repl_tcp_server
Showing
- CHANGES.rst 44 additions, 0 deletionsCHANGES.rst
- README.rst 2 additions, 2 deletionsREADME.rst
- docs/log_contexts.rst 8 additions, 3 deletionsdocs/log_contexts.rst
- docs/postgres.rst 3 additions, 3 deletionsdocs/postgres.rst
- docs/turn-howto.rst 34 additions, 4 deletionsdocs/turn-howto.rst
- scripts-dev/nuke-room-from-db.sh 33 additions, 10 deletionsscripts-dev/nuke-room-from-db.sh
- scripts/synapse_port_db 1 addition, 3 deletionsscripts/synapse_port_db
- synapse/__init__.py 1 addition, 1 deletionsynapse/__init__.py
- synapse/app/synctl.py 2 additions, 1 deletionsynapse/app/synctl.py
- synapse/appservice/__init__.py 20 additions, 18 deletionssynapse/appservice/__init__.py
- synapse/config/voip.py 8 additions, 0 deletionssynapse/config/voip.py
- synapse/federation/federation_server.py 6 additions, 2 deletionssynapse/federation/federation_server.py
- synapse/handlers/federation.py 32 additions, 27 deletionssynapse/handlers/federation.py
- synapse/handlers/message.py 1 addition, 1 deletionsynapse/handlers/message.py
- synapse/notifier.py 10 additions, 13 deletionssynapse/notifier.py
- synapse/push/push_rule_evaluator.py 57 additions, 47 deletionssynapse/push/push_rule_evaluator.py
- synapse/push/push_tools.py 2 additions, 5 deletionssynapse/push/push_tools.py
- synapse/rest/client/v1/voip.py 4 additions, 1 deletionsynapse/rest/client/v1/voip.py
- synapse/rest/client/v2_alpha/thirdparty.py 4 additions, 4 deletionssynapse/rest/client/v2_alpha/thirdparty.py
- synapse/types.py 1 addition, 3 deletionssynapse/types.py
Loading
Please register or sign in to comment