Jakub Trllo d3753fef31 Merge branch 'develop' into release/3.15.x ... # Conflicts: # openpype/hosts/aftereffects/api/pipeline.py # openpype/hosts/photoshop/api/pipeline.py # openpype/hosts/photoshop/plugins/create/create_legacy_image.py # openpype/modules/deadline/plugins/publish/submit_publish_job.py		2022-12-16 12:09:01 +01:00
..
event_handlers_server	Added missing parenthesis	2022-12-05 15:58:37 +07:00
event_handlers_user	import setting functions from 'openpype.settings'	2022-10-04 11:51:52 +02:00
ftrack_server	renamed 'check_ftrack_url' to 'resolve_ftrack_url'	2022-09-13 15:15:18 +02:00
launch_hooks	import setting functions from 'openpype.settings'	2022-10-04 11:51:52 +02:00
lib	fix occational double parents issue	2022-12-01 14:53:00 +01:00
plugins	use comment from instance where possible	2022-12-05 19:31:09 +01:00
python2_vendor	hack py2 ftrack api to store schema to user's directory instead of temp dir	2022-10-13 15:21:43 +02:00
scripts	add more information about where ftrack service is storing versions or where is looking for versions	2022-11-18 18:47:37 +01:00
tray	Merge branch 'develop' into release/3.15.x	2022-12-16 12:09:01 +01:00
__init__.py	renamed 'check_ftrack_url' to 'resolve_ftrack_url'	2022-09-13 15:15:18 +02:00
ftrack_module.py	added forgotten modules	2022-11-03 16:26:26 +01:00