perroned 554ce1d06b Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call ... Conflicts: bigbluebutton-html5/app/client/main.html bigbluebutton-html5/app/client/stylesheets/style.less bigbluebutton-html5/app/client/views/chat/chat_bar.html		2015-04-22 06:03:46 -07:00
..
chat	Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call	2015-04-22 06:03:46 -07:00
users	Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call	2015-04-22 06:03:46 -07:00
whiteboard	module headings margin change; footer background change	2015-04-20 19:41:51 +00:00
layout.html	move the HTML5 client code outside of labs	2015-03-05 17:55:23 +00:00
sharedTemplates.html	Disabled the tooltips on mobile devices.	2015-03-19 14:57:50 -07:00