Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into 2.0/sync_from_1.0

Browse source 
# Conflicts:
#	pype/ftrack/actions/action_djvview.py
#	pype/ftrack/actions/event_collect_entities.py
#	pype/ftrack/lib/ftrack_app_handler.py
#	pype/plugins/global/publish/collect_assumed_destination.py
#	pype/plugins/launcher/actions/AssetCreator.py
This commit is contained in:
Milan Kolar 2019-04-09 23:00:22 +02:00
parent 6c0bba1168
commit 7fe8d02abf
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pype/ftrack/lib/ftrack_base_handler.py
View file

@ -1,7 +1,7 @@
import functools
import time
from pype import api as pype
from pype.vendor import ftrack_api
import ftrack_api
class MissingPermision(Exception):