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
..
chat_bar.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
chat_bar.html	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