Mateus Dalepiane 0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock ... Conflicts: bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml		2015-04-29 12:10:41 -03:00
..
bbbResources.properties	Merge branch 'bigbluebutton/master' into 090-new-videodock	2015-04-29 12:10:41 -03:00