Commit Graph

4 Commits

Author SHA1 Message Date
perroned
642a4e45c5 Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton
Conflicts:
	bigbluebutton-html5/imports/ui/components/app/AppService.js
2016-05-13 14:54:19 -05:00
perroned
6adaff0c44 Cleans lint 2016-05-13 11:31:06 -05:00
perroned
6a9ccb355f Updates callServer arguments and passes credential object 2016-05-13 11:17:00 -05:00
perroned
d12c31e324 Moving components to structure 2016-05-13 09:39:10 -05:00