Skip to content
Snippets Groups Projects
Commit ff80b30d authored by Ghazi Triki's avatar Ghazi Triki
Browse files

Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master

# Conflicts:
#	bigbluebutton-html5/imports/ui/services/audio-manager/index.js
parents 827a900d 0ce0845c
No related branches found
No related tags found
No related merge requests found
Showing
with 874 additions and 12 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