Lucas Fialho Zawacki 65a2fb592f Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-dock-refactor		2018-03-20 17:22:11 +00:00
..
api	Merge pull request #5259 from oswaldoacauan/fix-ghost-and-reconnect-users	2018-03-19 14:07:46 -04:00
startup	Merge pull request #5259 from oswaldoacauan/fix-ghost-and-reconnect-users	2018-03-19 14:07:46 -04:00
ui	Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-dock-refactor	2018-03-20 17:22:11 +00:00
utils	remove locales.js which is unnecessary	2017-12-20 15:15:49 -02:00