Maxim Khlobystov e16ec283fe Merge branch 'creating-better-templates' of https://github.com/perroned/bigbluebutton into meteor-client-messages-better-templates ... Conflicts: labs/meteor-client/client/globals.coffee labs/meteor-client/client/views/chat/chat_bar.coffee labs/meteor-client/client/views/chat/chat_bar.html		2014-08-14 10:20:21 -07: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 private chat things	2014-08-14 07:48:08 -07:00
views	Merge branch 'creating-better-templates' of https://github.com/perroned/bigbluebutton into meteor-client-messages-better-templates	2014-08-14 10:20:21 -07:00
whiteboard_models	Merge remote-tracking branch 'anton/meteor-rebuild-server' into creating-better-templates	2014-08-13 13:56:04 -07:00
globals.coffee	Merge branch 'creating-better-templates' of https://github.com/perroned/bigbluebutton into meteor-client-messages-better-templates	2014-08-14 10:20:21 -07:00
main.coffee	Merge remote-tracking branch 'anton/meteor-rebuild-server' into creating-better-templates	2014-08-13 13:56:04 -07:00
main.html	Fixed up UI stuff, fixed up joining call/muting audio/detecting speaking	2014-08-12 09:25:15 -07:00