Matthew Marangoni 2f48cca53e Merge branch 'call-manager-2x' of https://github.com/Klauswk/bigbluebutton into Klauswk-call-manager-2x		2017-07-24 12:14:18 -07:00
..
1.1	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager	2017-07-24 11:00:30 -03:00
2.0	Merge branch 'call-manager-2x' of https://github.com/Klauswk/bigbluebutton into Klauswk-call-manager-2x	2017-07-24 12:14:18 -07:00
acl	Merge branch 'Acl' into Refactor2x	2017-06-19 11:28:17 -03:00
common/server	Merged info with anton's branch	2017-07-03 12:05:35 -03:00
log-client/server	Lint to eslint	2017-06-05 16:12:06 -03:00