BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8d52dc1b40
bigbluebutton-Github/bigbluebutton-html5/imports/api
History
Anton Georgiev 8d52dc1b40 Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/imports/api/chat/server/methods/sendChatMessagetoServer.js
	bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
	bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js
	bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js
	bigbluebutton-html5/imports/api/users/server/methods/muteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js
	bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js
	bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
	bigbluebutton-html5/imports/startup/server/eventHandlers.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
2016-05-16 19:54:51 +00:00
..
chat Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
cursor Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
deskshare Changes credential passing to 1 object 2016-05-16 13:12:27 -05:00
FontControl Changing structure to /api/list/index.js 2016-05-12 14:04:00 -05:00
meetings Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
phone Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
polls Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
presentations Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
shapes Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
slides Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
users Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
verto Changes collection imports 2016-05-16 13:05:44 -05:00