Anton Georgiev 71a062af95 Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates ... Conflicts: labs/meteor-client/client/globals.coffee labs/meteor-client/client/main.coffee labs/meteor-client/client/views/whiteboard/whiteboard.html labs/meteor-client/client/whiteboard_models/whiteboard_paper.coffee		2014-08-15 15:49:18 +00:00
..
slide.coffee	cleaning up and minor fix to slideshow error - whiteboard_paper's last function which is still under development	2014-08-15 15:22:39 +00:00
slide.html	cleaning up	2014-08-12 17:44:32 +00:00
whiteboard.html	Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates	2014-08-15 15:49:18 +00:00