Richard Alam 06faa8a448 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master		2018-01-31 14:38:43 -08:00
..
api	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master	2018-01-26 12:51:39 -08:00
startup	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master	2018-01-31 14:38:43 -08:00
ui	Merge pull request #5009 from KDSBrowne/z.0.6-prevent-ghost-user	2018-01-30 15:10:46 -05:00
utils	remove locales.js which is unnecessary	2017-12-20 15:15:49 -02:00