Klaus 9ab4430f68 Fix merge stuff		2017-07-26 11:31:35 -03:00
..
client	Fix merge stuff	2017-07-26 11:31:35 -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