Milan Kolar dbe6203318 Merge remote-tracking branch 'origin/ftrack-all-jakub' into sync-avalon ... # Conflicts: # pype/plugins/global/publish/collect_deadline_user.py # pype/plugins/global/publish/submit_publish_job.py fixed conflicts		2018-10-16 22:36:38 +02:00
..
fusion	Merge remote-tracking branch 'origin/ftrack-all-jakub' into sync-avalon	2018-10-16 22:36:38 +02:00
houdini	get up to dat with colorbleed. add 'studio.' to families temporarily	2018-10-16 22:26:42 +02:00
maya	get up to dat with colorbleed. add 'studio.' to families temporarily	2018-10-16 22:26:42 +02:00
nuke	all dependencies for ftrack solved	2018-10-16 14:39:21 +02:00
plugins	Merge remote-tracking branch 'origin/ftrack-all-jakub' into sync-avalon	2018-10-16 22:36:38 +02:00
utils	adding pyblish plugins from kredenc	2018-10-03 19:06:08 +02:00
vendor	all dependencies for ftrack solved	2018-10-16 14:39:21 +02:00
widgets	rename config folder	2018-10-02 22:55:04 +02:00
__init__.py	get up to dat with colorbleed. add 'studio.' to families temporarily	2018-10-16 22:26:42 +02:00
action.py	get up to dat with colorbleed. add 'studio.' to families temporarily	2018-10-16 22:26:42 +02:00
api.py	get up to dat with colorbleed. add 'studio.' to families temporarily	2018-10-16 22:26:42 +02:00
launcher_actions.py	rename config folder	2018-10-02 22:55:04 +02:00
lib.py	get up to dat with colorbleed. add 'studio.' to families temporarily	2018-10-16 22:26:42 +02:00
plugin.py	rename config folder	2018-10-02 22:55:04 +02:00
setdress_api.py	get up to dat with colorbleed. add 'studio.' to families temporarily	2018-10-16 22:26:42 +02:00