Felipe Cecagno 5d1534df8c 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		2015-12-08 17:42:43 -02:00
..
bbb-conf	Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.3	2015-12-08 17:42:43 -02:00
bbb-record	Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release	2015-05-17 19:25:26 -03:00