BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
97c94ecace
bigbluebutton-Github/bigbluebutton-html5/imports/api/users/server/modifiers
History
perroned 97c94ecace Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 
Conflicts:
	bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js
	bigbluebutton-html5/imports/api/phone/index.js
	bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js
2016-05-19 15:47:47 +00:00
..
clearUsersCollection.js Changes collection imports 2016-05-16 13:05:44 -05:00
createDummyUser.js Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
eventHandlers.js adjust path of collections 2016-05-16 20:26:24 +00:00
handleLockingMic.js Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
markUserOffline.js Changes credential passing to 1 object 2016-05-16 13:12:27 -05:00
requestUserLeaving.js Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
setUserLockedStatus.js Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
updateVoiceUser.js Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging 2016-05-16 19:54:51 +00:00
userJoined.js Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton 2016-05-19 15:47:47 +00:00