Jakub Trllo b0a6be63ac Merge branch 'develop' into release/3.15.x ... # Conflicts: # openpype/hosts/photoshop/api/workio.py # openpype/hosts/photoshop/plugins/publish/validate_unique_subsets.py # pyproject.toml # website/docs/artist_hosts_aftereffects.md		2023-01-24 12:31:32 +01:00
..
assets
settings_project_global.md	Merge branch 'develop' into release/3.15.x	2023-01-24 12:31:32 +01:00
settings_project_nuke.md
settings_project_standalone.md