Toke Stuart Jepsen b4d55bf1fa Merge branch 'develop' into feature/timers_manager_get_task_time ... # Conflicts: # openpype/modules/default_modules/ftrack/ftrack_module.py		2021-10-07 15:57:50 +01:00
..
event_handlers_server	removed unused exception variables	2021-09-14 10:41:54 +02:00
event_handlers_user	use constant for "intent" custom attribute	2021-10-05 10:19:25 +02:00
ftrack_server	event server cli uses validate mongo url from openpype.lib	2021-10-01 18:14:09 +02:00
launch_hooks	moved ftrack module	2021-07-28 14:19:35 +02:00
lib	use constant for "intent" custom attribute	2021-10-05 10:19:25 +02:00
plugins	#1938 - changed warning to info method	2021-09-07 12:08:49 +02:00
python2_vendor	added ftrack submodules to right folder	2021-07-29 11:16:18 +02:00
scripts	add openpype version information about each process	2021-09-14 16:26:05 +02:00
tray	use 'get_openpype_icon_filepath' instead of 'pype_icon_filepath'	2021-09-14 15:20:51 +02:00
__init__.py	moved ftrack module	2021-07-28 14:19:35 +02:00
ftrack_module.py	Merge branch 'develop' into feature/timers_manager_get_task_time	2021-10-07 15:57:50 +01:00