Milan Kolar 067a7c94cb Merge branch 'develop' into feature/PYPE-531_avalon_upstream_and_silos ... # Conflicts: # pype/ftrack/lib/avalon_sync.py		2019-10-25 15:50:38 +02:00
..
actions	Merge branch 'develop' into feature/PYPE-531_avalon_upstream_and_silos	2019-10-25 15:50:38 +02:00
events	fix of not correctly storing hierarchical attributes	2019-10-18 15:32:32 +02:00
ftrack_server	ftrack server print out traceback when file load fails	2019-09-04 11:09:43 +02:00
lib	Merge branch 'develop' into feature/PYPE-531_avalon_upstream_and_silos	2019-10-25 15:50:38 +02:00
tray	(hotfix) print traceback when ftrack server in tray crashes	2019-08-15 16:38:39 +02:00
__init__.py	tray parts moved to special folder so Qt is imported only there	2019-05-22 13:48:56 +02:00