7f991d1346
Conflicts: bigbluebutton-client/locale/en_US/bbbResources.properties bigbluebutton-client/locale/pt_BR/bbbResources.properties |
||
---|---|---|
.. | ||
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 | ||
bigbluebutton.js | ||
diff_match_patch_uncompressed.js | ||
jquery-1.5.1.min.js | ||
shared_notes.js |