Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

03ac0c91

Commit 03ac0c91 authored 10 years ago by David Baker

Downloads
- Plain Diff

Merge branch 'videocalls' into develop

Conflicts:
	webclient/room/room.html

parents 709b8ac2 da8b5a53

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

webclient/app-controller.js 32 additions, 3 deletions

webclient/app-controller.js
webclient/app.css 74 additions, 0 deletions

webclient/app.css
webclient/components/matrix/matrix-call.js 94 additions, 12 deletions

webclient/components/matrix/matrix-call.js
webclient/index.html 11 additions, 2 deletions

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

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

webclient/room/room.html

with 224 additions and 19 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