- merge master fix conflicts

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/package.json

@@ -11,7 +11,6 @@
     "@ant-design/icons": "^5.4.0",
     "@ant-design/pro-layout": "^7.19.11",
     "@apollo/client": "^3.10.8",
-    "@asseinfo/react-kanban": "^2.2.0",
     "@emotion/is-prop-valid": "^1.3.0",
     "@fingerprintjs/fingerprintjs": "^4.4.3",
     "@jsreport/browser-client": "^3.1.0",
@@ -44,6 +43,7 @@
     "markerjs2": "^2.32.1",
     "memoize-one": "^6.0.0",
     "normalize-url": "^8.0.1",
+    "object-hash": "^3.0.0",
     "prop-types": "^15.8.1",
     "query-string": "^9.1.0",
     "raf-schd": "^4.0.3",