Skip to content
Snippets Groups Projects
Commit 020df250 authored by perroned's avatar perroned
Browse files

Merge remote-tracking branch 'upstream/bbb-2x-mconf' into webrtc-utils 

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml
parents 1b92aba4 2e3d9e1b
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 2776 additions and 771 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

gitlab project and software management by fairkom.eu - more open source web apps at fairapps.net