Zach Fox 92c5ca2d75 Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd		2019-08-16 09:58:44 -07:00
..
emojiApp	Fixed bug with emote indicator icon not restoring	2019-08-16 09:46:46 -07:00
resources/sounds/claps	Removed extra file, moved qml images	2019-08-15 16:31:37 -07:00
ui/qml	Indicator image swapping	2019-08-15 17:20:27 -07:00
simplifiedEmote.js	Merge branch 'emojiAppAdd' of github.com:MiladNazeri/hifi into emojiAppAdd	2019-08-16 09:58:44 -07:00