Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

171d8b03

Commit 171d8b03 authored 10 years ago by David Baker

Downloads
- Plain Diff

Merge branch 'voip' into develop

Conflicts:
	webclient/room/room-controller.js

parents 1abc93d6 41d02ab6

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

webclient/app.js 2 additions, 0 deletions

webclient/app.js
webclient/components/matrix/event-handler-service.js 0 additions, 1 deletion

webclient/components/matrix/event-handler-service.js
webclient/components/matrix/matrix-call.js 264 additions, 0 deletions

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

webclient/components/matrix/matrix-phone-service.js
webclient/index.html 2 additions, 0 deletions

webclient/index.html
webclient/room/room-controller.js 35 additions, 2 deletions

webclient/room/room-controller.js
webclient/room/room.html 8 additions, 0 deletions

webclient/room/room.html

with 379 additions and 3 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