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
..
compatibility	Fixing up chat tabs... again.	2014-07-17 08:25:56 -07:00
lib	moved the code from the whiteboard prototype to the html5 client. Now will start integrating it	2014-07-29 19:23:16 +00:00
stylesheets	Fixed some UI overflowing issues	2014-08-15 06:58:33 -07:00
views	Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates	2014-08-15 15:49:18 +00:00
whiteboard_models	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
globals.coffee	Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates	2014-08-15 15:49:18 +00:00
main.coffee	Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into creating-better-templates	2014-08-15 15:49:18 +00:00
main.html	Fixed overflowing messages, and navbar	2014-08-14 12:22:51 -07:00