Skip to content
Snippets Groups Projects
Commit e55c3528 authored by Pedro Beschorner Marin's avatar Pedro Beschorner Marin
Browse files

Merge remote-tracking branch 'mconf/mconf' into pedrobmarin/mconf-fullscreen-video

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
parents 53097e73 596bad43
No related branches found
No related tags found
No related merge requests found
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 to comment