Roy Nieterau 14d767a97a Merge remote-tracking branch 'upstream/develop' into maya_new_publisher ... # Conflicts: # openpype/hosts/maya/plugins/create/create_look.py # openpype/hosts/maya/plugins/create/create_review.py # openpype/hosts/maya/plugins/publish/collect_instances.py # openpype/hosts/maya/plugins/publish/validate_attributes.py # openpype/hosts/maya/plugins/publish/validate_frame_range.py # openpype/hosts/maya/plugins/publish/validate_maya_units.py # openpype/hosts/maya/plugins/publish/validate_mesh_overlapping_uvs.py # openpype/modules/deadline/plugins/publish/collect_pools.py		2023-04-04 17:05:59 +02:00
..
event_handlers_server	Merge remote-tracking branch 'upstream/develop' into maya_new_publisher	2023-04-04 17:05:59 +02:00
event_handlers_user	Merge remote-tracking branch 'upstream/develop' into maya_new_publisher	2023-04-04 17:05:59 +02:00
ftrack_server	Merge remote-tracking branch 'upstream/develop' into maya_new_publisher	2023-04-04 17:05:59 +02:00
launch_hooks	import setting functions from 'openpype.settings'	2022-10-04 11:51:52 +02:00
lib	Merge remote-tracking branch 'upstream/develop' into maya_new_publisher	2023-04-04 17:05:59 +02:00
plugins	Merge remote-tracking branch 'upstream/develop' into maya_new_publisher	2023-04-04 17:05:59 +02: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	use 'get_host_ip' on more places	2023-01-06 17:48:05 +01:00
tray	Merge remote-tracking branch 'upstream/develop' into maya_new_publisher	2023-04-04 17:05:59 +02:00
__init__.py	renamed 'check_ftrack_url' to 'resolve_ftrack_url'	2022-09-13 15:15:18 +02:00
ftrack_module.py	added docstring for 'get_ftrack_url'	2023-02-01 17:23:11 +01:00