3db4ead6e4
Conflicts: bigbluebutton-client/locale/ru_RU/bbbResources.properties bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml |
||
---|---|---|
.. | ||
3rd-party.js | ||
bbb_api_bridge.js | ||
bbb_api_cam_preview.js | ||
bbb_api_cam_view.js | ||
bbb_blinker.js | ||
bbb_deskshare.js | ||
bbb_localization.js | ||
bbb_webrtc_bridge_sip.js | ||
bbblogger.js | ||
bigbluebutton.js | ||
jquery-1.5.1.min.js | ||
jssip-0.3.7.js | ||
sip.js |