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
..
client	Merge pull request #5009 from KDSBrowne/z.0.6-prevent-ghost-user	2018-01-30 15:10:46 -05:00
server	Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master	2018-01-31 14:38:43 -08:00
acl.js	Changed imports and removed 'initializeCursor.js' since it's not needed	2017-10-11 19:00:28 -07:00
mapToAcl.js	Fix Meteor.error subscription params	2017-12-13 16:27:53 -02:00