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
..
help	Added more explanation for Mac FireFox in screenshare-help.html	2016-08-30 17:01:30 -04:00
lib	Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x	2017-05-22 17:35:24 +01:00
swfobject
3rd-party.html
avatar.png
background.jpg
bbb-deskshare-applet-0.9.0.jar	update signed java applet	2016-12-04 11:16:32 -02:00
bbb-deskshare-applet-unsigned-0.9.0.jar	update signed java applet	2016-12-04 11:16:32 -02:00
bbb.gif	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
BigBlueButton.html	Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x	2017-05-22 17:35:24 +01:00
BigBlueButtonTest.html
EmbedBigBlueButton.html	remove old deskshare module and out-dated Java checks	2016-10-12 18:13:02 -04:00
example-info-data.xml
expressInstall.swf
get_flash_player.gif
layout.xml	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
locales.xml	Use the correct Arabic locale for the flash client.	2017-05-10 11:04:33 +01:00
logo.png	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
profiles.xml
screenshare-help.html
ScreenshareStandalone.html