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
..
__init__.py	credentials moved to lib	2019-05-22 13:45:30 +02:00
avalon_sync.py	Merge branch 'develop' into feature/PYPE-531_avalon_upstream_and_silos	2019-10-25 15:50:38 +02:00
credentials.py	credentials moved to lib	2019-05-22 13:45:30 +02:00
custom_db_connector.py	simplified sync and removed custom db connector	2019-07-01 22:37:58 +02:00
ftrack_action_handler.py	added plugins_presets to ftrack plugins init args	2019-08-09 19:36:24 +02:00
ftrack_app_handler.py	added plugins_presets to ftrack plugins init args	2019-08-09 19:36:24 +02:00
ftrack_base_handler.py	Merged in bugfix/PYPE-483_clockify_bug_fixes (pull request #269)	2019-09-02 10:05:04 +00:00
ftrack_event_handler.py	added plugins_presets to ftrack plugins init args	2019-08-09 19:36:24 +02:00
io_nonsingleton.py	changed schemas to new one	2019-09-20 18:21:09 +02:00