Merge branch 'develop' into enhancement/per-project-bundle

# Conflicts:
#	client/ayon_core/settings/lib.py
This commit is contained in:
Jakub Trllo 2025-06-16 18:04:05 +02:00
commit 3e60bd9ba4
126 changed files with 4635 additions and 2050 deletions

View file

@ -738,4 +738,3 @@ def main(force=False):
sys.exit(1)
main()