Seth Alves c7d56493b1 Merge branch 'master' of github.com:highfidelity/hifi into groups		2016-06-27 10:07:38 -07:00
..
web	Merge branch 'master' of github.com:highfidelity/hifi into groups	2016-06-27 10:07:38 -07:00
describe-settings.json	add a list of blacklist groups which remove permissions rather than grant them	2016-06-24 14:03:43 -07:00