Ghazi Triki ff80b30df1 Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master ... # Conflicts: # bigbluebutton-html5/imports/ui/services/audio-manager/index.js		2018-11-02 21:02:02 +01:00
..
api	Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master	2018-11-02 21:02:02 +01:00
startup	improve on callbacks when joining client	2018-10-25 15:51:53 +00:00
ui	Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master	2018-11-02 21:02:02 +01:00
utils	Add multiUserPenOnly parameter in yml	2018-10-18 14:03:11 -03:00