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
..
content	Fix merge conflicts	2017-06-05 13:52:46 +00:00
list	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-07-17 16:01:05 -07:00
trigger	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality	2017-06-27 12:41:12 -07:00
component.jsx	fix jaws ability to voice users in the userlist	2017-06-16 11:42:28 -07:00
styles.scss	Change relative path of the sass to absolute	2017-07-17 15:21:45 -03:00