Oleksandr Zhurbenko 5aed767436 Moved SwitchSlide method to 2.0		2017-07-24 14:04:49 -07:00
..
cursor	Resolved some of the issues related to the 2.0 switch	2017-07-14 16:20:16 -07:00
default-content	Fix merge conflicts	2017-06-05 13:52:46 +00:00
presentation-overlay	Resolved some of the issues related to the 2.0 switch	2017-07-14 16:20:16 -07:00
presentation-toolbar	Moved SwitchSlide method to 2.0	2017-07-24 14:04:49 -07:00
slide	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality	2017-06-07 13:29:35 -07:00
component.jsx	Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x	2017-07-14 15:43:41 -07:00
container.jsx	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality	2017-06-07 13:29:35 -07:00
service.js	Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x	2017-07-14 15:43:41 -07:00
styles.scss	Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x	2017-07-17 16:01:05 -07:00