Oleksandr Zhurbenko da7242737b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-improvements ... Conflicts: bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee		2015-12-13 20:20:10 -08:00
..
chat	Applied dynamic font-size for the input textarea	2015-11-05 15:16:33 -08:00
modals	added auto join voice chat	2015-11-20 17:21:02 -02:00
users	Add set presenter to HTML5	2015-12-07 13:33:52 -02:00
whiteboard	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-improvements	2015-12-13 20:20:10 -08:00
layout.html	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
sharedTemplates.coffee	Cleanup	2015-07-18 18:33:02 -07:00
sharedTemplates.html	Switched notifications to counters, added the styling for notifications for desktop views	2015-07-17 14:50:49 -07:00