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

Merge remote branch 'upstream/master' into pretty-micsettings 

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
parents ecac0b7a 921405f3
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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