Oleksandr Zhurbenko 52fae1b8c8 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into refs-to-callbacks		2017-06-05 19:51:20 -07:00
..
content	Fix merge conflicts	2017-06-05 13:52:46 +00:00
list	Fix merge conflicts	2017-06-05 13:52:46 +00:00
trigger	Fix merge conflicts	2017-06-05 13:52:46 +00:00
component.jsx	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into refs-to-callbacks	2017-06-05 19:51:20 -07:00
styles.scss	Change dropdown styles	2017-03-16 11:56:39 -03:00