Anton Georgiev 626e91fe1c Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merge-danny-ui ... Conflicts: labs/meteor-client/client/views/chat/chat_bar.coffee labs/meteor-client/client/views/users/user_item.html		2014-09-22 19:35:53 +00:00
..
chat_bar.coffee	Merge branch 'creating-better-templates' of github.com:perroned/bigbluebutton into merge-danny-ui	2014-09-22 19:35:53 +00:00
chat_bar.html	Cleaned a few UI things.	2014-09-11 09:37:41 -07:00