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
..
bin	Merge branch 'bbb-2.x-dev-mconf' into bbb-2x-mconf	2017-05-04 15:57:42 -07:00
cron.daily	Updated comment in crontab job	2017-05-04 05:04:25 -04:00
record
slides	Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room.	2016-10-14 16:33:17 +01:00
web	Merge remote-tracking branch 'bigbluebutton/master' into merge-master-into-2x	2017-05-22 17:35:24 +01:00
bigbluebutton-release	Bump version number to 1.1.0	2017-05-22 10:23:55 -05:00
check-localization-keys.txt