Merge branch 'develop' into fix-screen-sharing

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner 2021-01-05 20:41:06 +01:00
commit 640e6d68b3
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
16 changed files with 521 additions and 9 deletions

View file

@ -237,4 +237,6 @@
@import "./views/verification/_VerificationShowSas.scss";
@import "./views/voip/_CallContainer.scss";
@import "./views/voip/_CallView.scss";
@import "./views/voip/_DialPad.scss";
@import "./views/voip/_DialPadModal.scss";
@import "./views/voip/_VideoFeed.scss";