Roy Nieterau b3c21aaa9c Merge remote-tracking branch 'upstream/develop' into substance_integration ... # Conflicts: # openpype/plugins/publish/extract_thumbnail.py		2023-01-16 13:24:32 +01:00
..
project_anatomy	resolve conflicts	2022-12-09 19:21:17 +08:00
project_settings	Merge remote-tracking branch 'upstream/develop' into substance_integration	2023-01-16 13:24:32 +01:00
system_settings	Rename application group to substancepainter for consistency and clarity	2023-01-15 01:33:21 +01:00