Skip to content
Snippets Groups Projects
Commit fc460c39 authored by Chad Pilkey's avatar Chad Pilkey
Browse files

Merge remote-tracking branch 'upstream/master' into variable-wb-poll-size

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
parents 95ca4ad1 c875be4c
No related branches found
No related tags found
No related merge requests found
Showing
with 92 additions and 24 deletions
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