Ghazi Triki 7d283cd154 Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x ... # Conflicts: # bigbluebutton-client/resources/config.xml.template # bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as # bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml # record-and-playback/core/scripts/rap-process-worker.rb		2017-05-22 17:35:24 +01:00
..
3rd-party.js
adapter.js	Squashed commits for displaying WebRTC stats inside the Flex client.	2017-04-10 11:16:46 +01:00
bbb_api_bridge.js	Merge branch 'master' with bbb-mconf	2017-04-17 15:57:31 +00:00
bbb_api_cam_preview.js
bbb_api_cam_view.js
bbb_blinker.js	Branding back to BigBlueButton and adding back some of the client images we removed. This need to be reviewed to avoid having all this unused images!	2017-04-03 17:06:16 +00:00
bbb_localization.js
bbb_screenshare.js
bbb_webrtc_bridge_sip.js	Merge branch 'master' with bbb-mconf	2017-04-17 15:57:31 +00:00
bbblogger.js
bigbluebutton.js
diff_match_patch_uncompressed.js
getStats.js	Squashed commits for displaying WebRTC stats inside the Flex client.	2017-04-10 11:16:46 +01:00
jquery-1.5.1.min.js
jquery-2.1.1.min.js
jquery.cookie.js
jquery.dataTables.min.js
jquery.json-2.4.min.js
jquery.mobile.min.js
jsnlog.min.js
shared_notes.js
sip.js
verto_extension.js	Handle lib update/fix errors	2017-05-03 14:13:53 +00:00
verto-min.js	Overwrites popup function	2017-05-15 12:16:30 -04:00
webrtc_stats_bridge.js	Update webrtc stats bridge for modern Chrome/Firefox APIs	2017-05-05 11:22:38 -04:00
weburl_regex.js