Commit graph

3 commits

Author SHA1 Message Date
Milan Kolar
d58778e925 Merge branch 'develop' into feature/PYPE-99_unified_template_fill
# Conflicts:
#	pype/lib.py
#	pype/plugins/global/publish/integrate_rendered_frames.py
2019-02-17 21:25:27 +01:00
Jakub Jezek
e1b1663728 fixing importing module ftrack_api for different python versions 2019-02-13 16:37:46 -01:00
Jakub Jezek
fb81acfc8f moving ftrack plugins into publish folder 2019-02-13 16:22:29 -01:00