Milan Kolar e27b1ee0f8 Merge branch 'develop' into feature/PYPE-13-nuke-loadsequence ... # Conflicts: # pype/plugins/ftrack/integrate_ftrack_instances.py # pype/plugins/nuke/publish/collect_writes.py # pype/plugins/nuke/publish/integrate_rendered_frames.py		2018-12-05 13:43:10 +01:00
..
ftrack	add img and render to ftrack assets	2018-12-05 11:15:45 +01:00
fusion	cleaning up family names	2018-10-18 13:59:58 +02:00
global	Merge branch 'develop' into feature/PYPE-13-nuke-loadsequence	2018-12-05 13:43:10 +01:00
houdini	cleaning up family names	2018-10-18 13:59:58 +02:00
launcher/actions	changing way launcher actions are organized	2018-11-21 20:08:37 +01:00
maya	changing ftrack publishing from all families to only model and look for now.	2018-11-29 15:53:20 +01:00
nuke	Merge branch 'develop' into feature/PYPE-13-nuke-loadsequence	2018-12-05 13:43:10 +01:00