Felipe Cecagno 3070127a8e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button ... Conflicts: bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java bigbluebutton-client/branding/default/style/css/BBBDefault.css bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as		2014-01-15 17:53:10 -02:00
..
assets	updating the icon set (webcam, deskshare, microphone and record control) - same base icons, new "check" and "x" layers	2013-10-11 13:53:36 -03:00
BBBBlack.css	Implemented lock settings in bbb-client and bbb-apps.	2014-01-09 03:52:03 -02:00
BBBDefault.css	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button	2014-01-15 17:53:10 -02:00