Anton Georgiev 298927cf4f Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging ... Conflicts: bigbluebutton-html5/collections/collections.js bigbluebutton-html5/imports/api/meetings/server/meetings.js bigbluebutton-html5/imports/startup/server/collectionManagers/poll.js bigbluebutton-html5/imports/startup/server/eventHandlers.js bigbluebutton-html5/imports/startup/server/helpers.js bigbluebutton-html5/imports/startup/server/meteorMethods/publishVoteMessage.js bigbluebutton-html5/imports/startup/server/publish.js bigbluebutton-html5/imports/ui/components/app/AppService.js bigbluebutton-html5/server/server.js		2016-05-10 19:39:01 +00:00
..
meetings.js	Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging	2016-05-10 19:39:01 +00:00
publications.js	restructure; subscribe for remaining collections	2016-05-10 18:53:05 +00:00