Klaus 9cd3ac3f87 Merge branch 'bbb-2x-mconf' into fix-presenter-rule		2017-07-25 13:43:26 -03:00
..
server	Merge branch 'bbb-2x-mconf' into fix-presenter-rule	2017-07-25 13:43:26 -03:00
index.js	Add stuff from 2.x	2017-06-19 10:13:35 -03:00