Oleksandr Zhurbenko a6e38c69f1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements ... Conflicts: bigbluebutton-html5/app/client/main.html bigbluebutton-html5/app/client/stylesheets/style.less		2015-11-04 15:47:14 -08:00
..
lib	it was trying to reuse username from cache	2015-10-29 22:10:33 +00:00
stylesheets	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements	2015-11-04 15:47:14 -08:00
views	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements	2015-11-04 15:47:14 -08:00
whiteboard_models	Added outer whitespace to the poll shape, as in the Flash client	2015-09-11 13:07:50 -07:00
globals.coffee	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements	2015-11-04 15:47:14 -08:00
main.coffee	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements	2015-11-04 15:47:14 -08:00
main.html	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements	2015-11-04 15:47:14 -08:00
NotificationControl.coffee	Made the notifications look appropriately sized regardless of the device type or screen orientation.	2015-08-26 17:37:27 -04:00