Milan Kolar 03d85fafb8 Merge branch 'develop' into 2.0/sync_from_1.0 ... # Conflicts: # pype/ftrack/lib/ftrack_app_handler.py		2019-04-12 18:59:22 +02:00
..
__init__.py	Merge branch 'develop' into 2.0/sync_from_1.0	2019-04-12 18:59:22 +02:00
actions.py	update validate families	2018-12-13 18:14:24 +01:00
lib.py	Merge branch 'develop' into 2.0/sync_from_1.0	2019-04-12 18:59:22 +02:00
menu.py	fixing setting format to use crop value	2018-12-02 22:18:33 +01:00
templates.py	logger fixes	2019-04-09 18:22:55 +02:00