Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

c58eb0d5

Commit c58eb0d5 authored 10 years ago by David Baker

Downloads
- Plain Diff

Merge branch 'turn' into develop

parents 59f2bef1 c0936b10

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

synapse/config/homeserver.py 2 additions, 1 deletion

synapse/config/homeserver.py
synapse/config/voip.py 41 additions, 0 deletions

synapse/config/voip.py
synapse/rest/__init__.py 2 additions, 1 deletion

synapse/rest/__init__.py
synapse/rest/voip.py 60 additions, 0 deletions

synapse/rest/voip.py
webclient/components/matrix/matrix-call.js 55 additions, 3 deletions

webclient/components/matrix/matrix-call.js
webclient/components/matrix/matrix-service.js 4 additions, 0 deletions

webclient/components/matrix/matrix-service.js
webclient/index.html 1 addition, 1 deletion

webclient/index.html

with 165 additions and 6 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment