Merge branch 'master' into upgrade-to-red5-r4597
Showing
- bigbluebutton-client/locale/en_US/bbbResources.properties 3 additions, 2 deletionsbigbluebutton-client/locale/en_US/bbbResources.properties
- bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml 5 additions, 5 deletions...c/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml 46 additions, 3 deletions.../bigbluebutton/modules/users/views/MediaItemRenderer.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml 23 additions, 10 deletions...bigbluebutton/modules/users/views/StatusItemRenderer.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml 25 additions, 2 deletions...rc/org/bigbluebutton/modules/users/views/UsersWindow.mxml
Loading
Please register or sign in to comment