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
..
css	Updated landingage page for 1.1-beta	2016-12-16 10:14:24 -06:00
fonts	Updated landingage page for 1.1-beta	2016-12-16 10:14:24 -06:00
images	Updates to text and tutorial videos on home page	2014-09-01 20:00:01 -04:00
js	Reverted changes to error rendering response from join	2016-06-30 17:52:10 -04:00
default.pdf	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
favicon.ico	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
help.html	- add help.html	2010-04-01 21:34:13 +00:00
index.html	Bump version number to 1.1.0	2017-05-22 10:23:55 -05:00
robots.txt	disallow crawlers	2017-03-12 21:46:18 -03:00
testjava.html	- change test java link	2013-10-21 21:50:38 +00:00