Oleksandr Zhurbenko 3581e8abeb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-improvements ... Conflicts: bigbluebutton-html5/app/client/stylesheets/whiteboard.less		2015-12-02 17:09:51 -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	Changed the mobile navbar icons (thus reducing the number of animations) and redesigned the Settings menu.	2015-11-28 21:18:58 -08:00
whiteboard	Took the whiteboard controls out of the whiteboard container, removed check for the opened upload window	2015-11-29 11:45:08 -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