Roy Nieterau 971dfffa7b Merge remote-tracking branch 'upstream/develop' into refactor_integrator ... # Conflicts: # openpype/plugins/publish/integrate_new.py		2022-04-14 12:33:07 +02:00
..
project_anatomy	Merge branch 'develop' into feature/OP-2983_simple-texture-publishing	2022-04-05 17:02:47 +02:00
project_settings	Merge remote-tracking branch 'upstream/develop' into refactor_integrator	2022-04-14 12:33:07 +02:00
system_settings	added settings for white list of environment variables	2022-04-08 15:58:59 +02:00