ayon-core/pype/plugins/global/publish
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
..
cleanup.py rename config folder 2018-10-02 22:55:04 +02:00
collect_assumed_destination.py get up to dat with colorbleed. add 'studio.' to families temporarily 2018-10-16 22:26:42 +02:00
collect_comment.py rename config folder 2018-10-02 22:55:04 +02:00
collect_context_label.py rename config folder 2018-10-02 22:55:04 +02:00
collect_current_shell_file.py rename config folder 2018-10-02 22:55:04 +02:00
collect_deadline_user.py Merge remote-tracking branch 'origin/ftrack-all-jakub' into sync-avalon 2018-10-16 22:36:38 +02:00
collect_filesequences.py Merge remote-tracking branch 'origin/ftrack-all-jakub' into sync-avalon 2018-10-16 22:36:38 +02:00
collect_json.py Merge branch 'initialisation' into nuke-all-jakub 2018-10-02 23:49:09 +02:00
collect_shell_workspace.py rename config folder 2018-10-02 22:55:04 +02:00
collect_time.py rename config folder 2018-10-02 22:55:04 +02:00
extract_json.py Merge branch 'initialisation' into nuke-all-jakub 2018-10-02 23:49:09 +02:00
integrate.py get up to dat with colorbleed. add 'studio.' to families temporarily 2018-10-16 22:26:42 +02:00
submit_publish_job.py Merge remote-tracking branch 'origin/ftrack-all-jakub' into sync-avalon 2018-10-16 22:36:38 +02:00
validate_file_saved.py Merge branch 'initialisation' into nuke-all-jakub 2018-10-02 23:49:09 +02:00
validate_resources.py get up to dat with colorbleed. add 'studio.' to families temporarily 2018-10-16 22:26:42 +02:00
validate_sequence_frames.py get up to dat with colorbleed. add 'studio.' to families temporarily 2018-10-16 22:26:42 +02:00