Ghazi Triki 66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0 ... # Conflicts: # bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml # bigbluebutton-config/bigbluebutton-release # bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)		2018-07-16 16:08:38 +01:00
..
bin	Update bbb-conf due to chromeExtensionLinkURL	2018-07-15 16:15:50 +02:00
cron.daily	Improve bigbluebutton cleanup cron job	2018-06-29 10:49:19 -04:00
record	added chrome plugin patch for test recording	2010-11-19 05:04:16 +00:00
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	Added blank pages for whiteboard	2018-07-07 17:30:19 -04:00
bigbluebutton-release	Bumped version to 2.0-RC2	2018-07-07 17:10:31 -04:00
check-localization-keys.txt	remove and add strings for the localization file	2013-05-27 17:56:48 -05:00