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
..
project_anatomy	Merge branch 'release/3.15.x' into feature/OP-2479_color-v3-Colorspace-management-and-distribution	2023-01-18 18:01:23 +01:00
project_settings	Merge branch 'develop' into release/3.15.x	2023-01-24 12:31:32 +01:00
system_settings	resolve conflicts	2022-12-09 19:21:17 +08:00