mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-01 16:34:53 +01:00
Merge branch 'develop' into enhancement/per-project-bundle
# Conflicts: # client/ayon_core/settings/lib.py
This commit is contained in:
commit
3e60bd9ba4
126 changed files with 4635 additions and 2050 deletions
|
|
@ -738,4 +738,3 @@ def main(force=False):
|
|||
sys.exit(1)
|
||||
|
||||
main()
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue