Commit 3b0bcb0a authored by Gandalf's avatar Gandalf
Browse files

Merge main into develop

Brings in HAF submodule update (release/1.28.4) from main.

Conflict resolution:
- .gitlab-ci.yml: Use main's HAF ref (f1ebe0ea)
- haf submodule: Update to main's version (1.28.4)
- Deleted page files: Keep deleted (develop removed these)
- pnpm-lock.yaml: Keep develop's version
- pnpm-workspace.yaml: Keep develop's healthchecker version
- votingPOM.spec.ts: Keep develop's test code
parents 027f5983 3993b5cf
Loading
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment