John Conklin II 92bf99f436 Merge pull request #12786 from huffman/fix/node-list-connections ... Fix avatars not coming back when briefly disconnected from avatar mixer		2018-04-20 09:53:50 -07:00
..
resources	Merge pull request #12692 from highfidelity/stable	2018-03-22 15:08:30 -07:00
src	Merge pull request #12786 from huffman/fix/node-list-connections	2018-04-20 09:53:50 -07:00
CMakeLists.txt	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration	2018-02-22 19:45:43 -08:00