# Conflicts:
#	package.json
#	src/hub.js
#	yarn.lock

Update naf-janus-adapter to fix Chrome webrtc issue

fixed faceculling order on geometry for lines and caps, both even and odd segments. Added timed delete per line. Fixed networking bug where line data could be sent before remote clients were fully initialized. Adding drawing manager that prevents multiple pens from drawing on the same drawing at the same time.

Update GLTFLoader to dev/hubs-v2 + envMap and gamma

Properly set npm debug log filter

Merge branch 'feature/update-gltf-loader' of https://github.com/mozilla/hubs into feature/update-gltf-loader

Make default WDS config nicer for newbies

Fix build environment variable loading

Small build fixups