RebeccaStankus 4720c64af8 Merge branch 'master' of github.com:highfidelity/hifi into ouputMutedOverlay		2019-10-14 13:02:54 -07:00
..
images
simplifiedNametag	removed extra disconnect function	2019-10-09 13:26:53 -07:00
simplifiedStatusIndicator	changed status indicator to be similar to nametag and emoji	2019-09-05 10:29:25 -07:00
simplifiedUI.js	Merge branch 'master' of github.com:highfidelity/hifi into ouputMutedOverlay	2019-10-14 13:02:54 -07:00