8412575c40
# Conflicts: # front/src/WebRtc/MediaManager.ts |
||
---|---|---|
.. | ||
CoWebsiteManager.ts | ||
HtmlUtils.ts | ||
JitsiFactory.ts | ||
LayoutManager.ts | ||
MediaManager.ts | ||
ScreenSharingPeer.ts | ||
SimplePeer.ts | ||
VideoPeer.ts |
8412575c40
# Conflicts: # front/src/WebRtc/MediaManager.ts |
||
---|---|---|
.. | ||
CoWebsiteManager.ts | ||
HtmlUtils.ts | ||
JitsiFactory.ts | ||
LayoutManager.ts | ||
MediaManager.ts | ||
ScreenSharingPeer.ts | ||
SimplePeer.ts | ||
VideoPeer.ts |