Jakub Trllo d3753fef31 Merge branch 'develop' into release/3.15.x ... # Conflicts: # openpype/hosts/aftereffects/api/pipeline.py # openpype/hosts/photoshop/api/pipeline.py # openpype/hosts/photoshop/plugins/create/create_legacy_image.py # openpype/modules/deadline/plugins/publish/submit_publish_job.py		2022-12-16 12:09:01 +01:00
..
aftereffects	Merge branch 'develop' into release/3.15.x	2022-12-16 12:09:01 +01:00
blender	Merge pull request #4225 from pypeclub/feature/OP-4632_qtpy-in-module-tools	2022-12-16 11:54:25 +01:00
celaction	resolve conflicts	2022-12-09 19:21:17 +08:00
flame	resolve conflicts	2022-12-09 19:21:17 +08:00
fusion	use qtpy in fusion	2022-12-13 17:48:48 +01:00
harmony	use qtpy in hosts which have use openpype process	2022-12-13 17:47:52 +01:00
hiero	resolve conflicts	2022-12-09 19:21:17 +08:00
houdini	use new interface class name for publish host	2022-12-13 14:00:24 +01:00
max	resolve conflicts	2022-12-09 19:21:17 +08:00
maya	Merge pull request #4098 from moonyuet/bugfix/OP-4302-Layout-publish-more-than-one-container-issue	2022-12-15 14:59:54 +01:00
nuke	resolve conflicts	2022-12-09 19:21:17 +08:00
photoshop	Merge branch 'develop' into release/3.15.x	2022-12-16 12:09:01 +01:00
resolve	change imports in hosts	2022-11-03 16:27:38 +01:00
standalonepublisher	resolve conflicts	2022-12-09 19:21:17 +08:00
traypublisher	resolve conflicts	2022-12-09 19:21:17 +08:00
tvpaint	use qtpy in hosts which have use openpype process	2022-12-13 17:47:52 +01:00
unreal	Merge pull request #4225 from pypeclub/feature/OP-4632_qtpy-in-module-tools	2022-12-16 11:54:25 +01:00
webpublisher	resolve conflicts	2022-12-09 19:21:17 +08:00
__init__.py