Merge commit 'ace284e265a65006263fcecab7865c5e1ebd899f' into feature-tabletop

app/package-lock.json

@@ -3426,15 +3426,9 @@
       "dev": true
     },
     "signal-exit": {
-<<<<<<< HEAD
-      "version": "3.0.2",
-      "resolved": "",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
-=======
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
->>>>>>> version-2
     },
     "simpl-schema": {
       "version": "1.13.1",
@@ -3748,9 +3742,9 @@
       "dev": true
     },
     "three": {
-      "version": "0.139.2",
-      "resolved": "https://registry.npmjs.org/three/-/three-0.139.2.tgz",
-      "integrity": "sha512-gV7q7QY8rogu7HLFZR9cWnOQAUedUhu2WXAnpr2kdXZP9YDKsG/0ychwQvWkZN5PlNw9mv5MoCTin6zNTXoONg=="
+      "version": "0.148.0",
+      "resolved": "https://registry.npmjs.org/three/-/three-0.148.0.tgz",
+      "integrity": "sha512-8uzVV+qhTPi0bOFs/3te3RW6hb3urL8jYEl6irjCWo/l6sr8MPNMcClFev/MMYeIxr0gmDcoXTy/8LXh/LXkfw=="
     },
     "to-regex-range": {
       "version": "5.0.1",