commit 8d1ce9dae1fd94204c142ac599b498bec9680b6c parent 09046010252b134348de8b18c0c99ffea4e3c95d Author: Christian Blättler <blatc2@bfh.ch> Date: Wed, 1 May 2024 08:00:06 +0200 Merge branch 'master' into feature/tokens # Conflicts: # packages/auditor-backoffice-ui/src/InstanceRoutes.tsx # packages/merchant-backoffice-ui/src/declaration.d.ts # packages/merchant-backoffice-ui/src/schemas/index.ts Diff is too large, output suppressed.