ayon-core/pype/plugins
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
global 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 nuke plugins work 2018-10-07 08:14:01 +02:00