Merge remote-tracking branch 'upstream/develop' into fix-screen-sharing

This commit is contained in:
Šimon Brandner 2021-01-13 19:47:07 +01:00
commit b2850e11db
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
46 changed files with 5628 additions and 300 deletions

View file

@ -238,5 +238,6 @@
@import "./views/voip/_CallContainer.scss";
@import "./views/voip/_CallView.scss";
@import "./views/voip/_DialPad.scss";
@import "./views/voip/_DialPadContextMenu.scss";
@import "./views/voip/_DialPadModal.scss";
@import "./views/voip/_VideoFeed.scss";