Skip to content
Snippets Groups Projects
Commit 5d1534df authored by Felipe Cecagno's avatar Felipe Cecagno
Browse files

Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.3

Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/sip.js
parents dd99398f 6ac691e7
No related branches found
No related tags found
Loading
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