Thijs Wenker bf81ae78b9 Merge branch 'master' of https://github.com/highfidelity/hifi into make-connection-fix ... # Conflicts: # scripts/system/makeUserConnection.js		2017-04-26 22:52:57 +02:00
..
developer	Merge pull request #10190 from samcake/ambient-bis	2017-04-14 13:28:59 -07:00
modules	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
system	Merge branch 'master' of https://github.com/highfidelity/hifi into make-connection-fix	2017-04-26 22:52:57 +02:00
tutorials	Merge pull request #10175 from PhilipRosedale/springHold	2017-04-26 13:16:17 -07:00
defaultScripts.js	Fix tablet-close behavior for PAL; remove users-tablet.js	2017-03-29 14:53:45 -07:00