Merge branch 'master' into dwelle/bump-socket.io

# Conflicts: # src/locales/en.json
2023-01-05 18:54:26 +01:00
parent 05df951770 0f11f7da15
commit fb4a7bdf45
111 changed files with 3441 additions and 2849 deletions
@@ -102,7 +102,7 @@
  "private": true,
  "scripts": {
    "build-node": "node ./scripts/build-node.js",
-    "build:app:docker": "REACT_APP_DISABLE_SENTRY=true react-scripts build",
+    "build:app:docker": "cross-env REACT_APP_DISABLE_SENTRY=true REACT_APP_DISABLE_TRACKING=true react-scripts build",
    "build:app": "cross-env REACT_APP_GIT_SHA=$VERCEL_GIT_COMMIT_SHA react-scripts build",
    "build:version": "node ./scripts/build-version.js",
    "build": "yarn build:app && yarn build:version",