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
..
video-list	Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master	2018-11-02 21:02:02 +01:00
video-menu	Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning	2018-10-23 14:21:58 -02:00
component.jsx	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master	2018-11-01 14:00:54 +01:00
container.jsx	Add users-settings collection and handle dynamic configuration	2018-09-13 15:09:30 -03:00
service.js	Get more detailed logs from the video component	2018-07-25 18:53:12 -03:00
styles.scss	Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning	2018-10-23 14:21:58 -02:00