Felipe Cecagno bbcfe1f34a Merge remote-tracking branch 'bigbluebutton/master' into mconf ... Conflicts: bigbluebutton-html5/app/client/globals.js bigbluebutton-html5/app/client/main.html bigbluebutton-html5/app/client/views/whiteboard/whiteboard.html		2016-03-04 20:19:55 -03:00
..
presentation.rb	Merge remote-tracking branch 'bigbluebutton/master' into mconf	2016-03-04 20:19:55 -03:00