perroned e1e12fe3c6 Merge remote-tracking branch 'maxim/meteor-client-messages-better-templates' into creating-better-templates ... Conflicts: labs/meteor-client/client/views/chat/chat_bar.html		2014-08-15 12:17:37 -07:00
..
compatibility	Removed unused code and fixed UI issue with chat greeting	2014-08-15 11:30:43 -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	Made neater after remove bootstrap2 package	2014-08-15 12:14:10 -07:00
views	Merge remote-tracking branch 'maxim/meteor-client-messages-better-templates' into creating-better-templates	2014-08-15 12:17:37 -07:00
whiteboard_models	Merge branch 'more-whiteboard-shapes' of https://github.com/lfzawacki/bigbluebutton into creating-better-templates	2014-08-15 15:52:47 +00:00
globals.coffee	Merge remote-tracking branch 'maxim/meteor-client-messages-better-templates' into creating-better-templates	2014-08-15 12:17:37 -07:00
main.coffee	Removed unused code and fixed UI issue with chat greeting	2014-08-15 11:30:43 -07:00
main.html	Fixed ,ajor issues with duplication of button handler preventing audio calls from being made	2014-08-15 09:26:17 -07:00