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
..
config	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0	2018-07-16 16:08:38 +01:00
locales	Merge pull request #5840 from Tainan404/issue-5833	2018-07-12 14:38:19 -04:00