Oleksandr Zhurbenko d208da2c31 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui ... Conflicts: bigbluebutton-html5/app/client/globals.coffee		2015-09-10 15:01:09 -07:00
..
slide.coffee	Removed unnecessary Tracker.autorun and cleaned up things	2015-09-09 10:24:57 -07:00
slide.html	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
whiteboard.coffee	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui	2015-09-10 15:01:09 -07:00
whiteboard.html	Added proper scaling for the whiteboard when a polling or bottom presenter buttons templates are rendered or destroyed	2015-09-08 16:57:39 -07:00