gcampes 903ba22713 Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 ... * upstream/master: Removed carriage returns from bigbluebutton.properties make function export default fix Meteor.Error removed duplication fixed lint issue added suggestions removed console logs fixed lint issues added moderator condition Shows main setting options based on role		2016-11-29 08:25:59 -02:00
..
server	Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5	2016-11-29 08:25:59 -02:00
index.js	Moves to api/collection/index	2016-05-16 09:14:02 -05:00