Merge remote-tracking branch 'origin/main' into cpr-fix

Browse Source

# Conflicts:
#	api/package-lock.json
#	api/package.json
#	api/public/swagger.yaml

...

This commit is contained in:

YuryShkoda

2026-07-14 16:28:10 +03:00

parent 66232aefd2 681f0123ad

commit 386185d1a0

46 changed files with 13563 additions and 25341 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

web/package-lock.json

Generated

+1982 -1428

File diff suppressed because it is too large Load Diff