iLLiCiTiT 4f7b15395b Merge branch 'develop' into feature/task_to_version_use_setings ... # Conflicts: # pype/tools/settings/settings/gui_schemas/projects_schema/schema_project_ftrack.json		2020-12-17 11:35:35 +01:00
..
project_anatomy	add short task names to anatomy attributes	2020-12-03 18:30:10 +01:00
project_settings	Merge branch 'develop' into feature/task_to_version_use_setings	2020-12-17 11:35:35 +01:00
system_settings	add QT scaling factor to gloval env	2020-12-15 12:57:11 +01:00