Commit graph

6 commits

Author SHA1 Message Date
Zach Fox
bfb4c0c49a Fixup emote indicator 2019-08-15 09:21:42 -07:00
RebeccaStankus
46a8e804b3 Working on tray functionality 2019-08-15 09:11:52 -07:00
RebeccaStankus
bc67241100 Finished changes for CR feedback 2019-08-14 14:09:48 -07:00
RebeccaStankus
0645796e74 Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd 2019-08-14 13:28:08 -07:00
RebeccaStankus
8728640f60 Initial CR changes 2019-08-14 12:03:49 -07:00
milad
1a95c126c3 working version but taking a snapshot of added emoji code before removing for handoff 2019-08-06 13:13:38 -07:00