Klaus 1ff3df770a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user		2017-07-31 17:01:04 -03:00
..
client	Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user	2017-07-31 17:01:04 -03:00
server	Fix missing merge in redis2x	2017-07-13 17:23:20 -03:00
acl.js	we do not have 1.0 user messages coming from bbb so use 2.0 only	2017-06-27 18:14:53 -04:00
mapToAcl.js	Add stuff from 2.x	2017-06-19 10:13:35 -03:00