Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
ayon-core/openpype
History
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
..
client resolve conflicts 2022-12-09 19:21:17 +08:00
hooks resolve conflicts 2022-12-09 19:21:17 +08:00
host resolve conflicts 2022-12-09 19:21:17 +08:00
hosts Merge branch 'develop' into release/3.15.x 2022-12-16 12:09:01 +01:00
lib Merge branch 'develop' into release/3.15.x 2022-12-16 12:09:01 +01:00
modules Merge branch 'develop' into release/3.15.x 2022-12-16 12:09:01 +01:00
pipeline resolve conflicts 2022-12-09 19:21:17 +08:00
plugins Merge branch 'develop' into release/3.15.x 2022-12-16 12:09:01 +01:00
resources resolve conflicts 2022-12-09 19:21:17 +08:00
scripts ffprobe run as list of args instead of string 2022-10-25 10:31:53 +02:00
settings Merge branch 'develop' into release/3.15.x 2022-12-16 12:09:01 +01:00
style resolve conflicts 2022-12-09 19:21:17 +08:00
tests OP-3426 - refactor - replaced check of env var with function 2022-11-07 11:40:15 +01:00
tools Merge branch 'develop' into release/3.15.x 2022-12-16 12:09:01 +01:00
vendor resolve conflicts 2022-12-09 19:21:17 +08:00
widgets Merge branch 'develop' into feature/attribute_defs_dialog 2022-11-01 14:11:03 +01:00
__init__.py
__main__.py
action.py resolve conflicts 2022-12-09 19:21:17 +08:00
api.py removed config 2022-09-23 18:49:34 +02:00
cli.py Merge branch 'develop' into release/3.15.x 2022-12-16 12:09:01 +01:00
plugin.py
pype_commands.py OP-3426 - fix - wrong flag used in pype_commands 2022-10-24 10:48:14 +02:00
version.py [Automated] Bump version 2022-12-14 03:30:40 +00:00