-
- Downloads
Merge branch 'master' into close-popups-at-logout
# Conflicts: # bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml # bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
Showing
- bigbluebutton-client/locale/en_US/bbbResources.properties 2 additions, 0 deletionsbigbluebutton-client/locale/en_US/bbbResources.properties
- bigbluebutton-client/src/VideoconfModule.mxml 9 additions, 11 deletionsbigbluebutton-client/src/VideoconfModule.mxml
- bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml 3 additions, 3 deletions...rc/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/main/views/ChromeChangeMicImage.mxml 0 additions, 86 deletions...rc/org/bigbluebutton/main/views/ChromeChangeMicImage.mxml
- bigbluebutton-client/src/org/bigbluebutton/main/views/FirefoxChangeMicImage.mxml 0 additions, 90 deletions...c/org/bigbluebutton/main/views/FirefoxChangeMicImage.mxml
- bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml 0 additions, 29 deletions...rc/org/bigbluebutton/main/views/MainApplicationShell.mxml
- bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml 2 additions, 0 deletions.../src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml 1 addition, 1 deletion...c/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
- bigbluebutton-client/src/org/bigbluebutton/modules/phone/events/WebRTCAskUserToChangeMicEvent.as 0 additions, 17 deletions...ton/modules/phone/events/WebRTCAskUserToChangeMicEvent.as
- bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as 10 additions, 0 deletions...luebutton/modules/videoconf/maps/VideoEventMapDelegate.as
- labs/bbb-api-php/README.md 0 additions, 0 deletionslabs/bbb-api-php/README.md
Loading
Please register or sign in to comment