Oleksandr Zhurbenko 23263c997b Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x		2017-07-17 16:01:05 -07:00
..
base	Fix merge conflicts	2017-06-05 13:52:46 +00:00
component.jsx	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality	2017-06-07 13:29:35 -07:00
styles.scss	Merge pull request #4109 from Klauswk/fix-sass-path	2017-07-17 14:58:02 -04:00