Roy Nieterau b180c5c43d Merge branch 'develop' of https://github.com/ynput/ayon-core into enhancement/usd_workflow ... # Conflicts: # server_addon/houdini/client/ayon_houdini/version.py # server_addon/houdini/package.py		2024-06-27 16:21:06 +02:00
..
settings	Merge branch 'develop' of https://github.com/ynput/ayon-core into enhancement/usd_workflow	2024-06-27 16:21:06 +02:00
__init__.py	houdini uses package.py	2024-04-22 14:26:24 +02:00