Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 08:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into release/3.15.x

Browse source 
# Conflicts:
#	openpype/hosts/photoshop/api/workio.py
#	openpype/hosts/photoshop/plugins/publish/validate_unique_subsets.py
#	pyproject.toml
#	website/docs/artist_hosts_aftereffects.md
This commit is contained in:
Jakub Trllo 2023-01-24 12:31:32 +01:00
commit b0a6be63ac
51 changed files with 920 additions and 800 deletions
Download patch file Download diff file Expand all files Collapse all files

2
openpype/settings/lib.py
View file

@ -581,7 +581,7 @@ def load_jsons_from_dir(path, *args, **kwargs):
Data are loaded recursively from a directory and recreate the
hierarchy as a dictionary.
Entered path hiearchy:
Entered path hierarchy:
|_ folder1
| |_ data1.json
|_ folder2