Bobak Oftadeh 09147faaac Fixed conflicts after merge		2019-01-03 20:50:43 +00:00
..
actions-dropdown	Fixed conflicts after merge	2019-01-03 20:50:43 +00:00
create-breakout-room	Merge remote-tracking branch 'upstream/master' into issue-6260	2018-12-19 16:58:52 -02:00
desktop-share	Fix console warning	2018-11-29 14:58:39 -02:00
component.jsx	fix lint errors	2018-12-18 15:15:51 +00:00
container.jsx	Implemented recording timer	2019-01-03 18:43:17 +00:00
service.js	Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into testRecord	2019-01-03 20:28:27 +00:00
styles.scss	Fix console warning	2018-11-29 14:58:39 -02:00