Commit graph

6 commits

Author SHA1 Message Date
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
Milan Kolar
9a99d640fe get up to dat with colorbleed. add 'studio.' to families temporarily 2018-10-16 22:26:42 +02:00
Jakub Jezek
c668594a35 commit fixes app.lib 2018-10-10 17:10:49 +02:00
Jakub Jezek
8b931f5207 adding pyblish plugins from kredenc 2018-10-03 19:06:08 +02:00
Jakub Jezek
fe1372fef6 convert "colorbleed" to either "studio" or "config" 2018-09-20 10:37:03 +02:00
Jakub Jezek
b72efea31c initial commit 2018-09-13 15:11:59 +02:00