Felipe Cecagno 417b518c2b Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into guest-role-0.81 ... Conflicts: bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml		2014-02-24 12:37:35 -03:00
..
assets	better handling the settings window; now the window is only created when the user clicks on the button, so it won't be shown anymore for non-moderator participants	2013-09-15 19:07:36 -03:00
BBBBlack.css	- add a black theme file	2013-03-23 20:48:55 +00:00
BBBDefault.css	Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into guest-role-0.81	2014-02-24 12:37:35 -03:00