Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into enhancement/OP-2075_version-handling

Browse source
This commit is contained in:
iLLiCiTiT 2021-12-08 17:36:33 +01:00
commit c70f77eed3
101 changed files with 2176 additions and 520 deletions
Download patch file Download diff file Expand all files Collapse all files

9
openpype/settings/defaults/system_settings/applications.json
View file

@ -107,7 +107,10 @@
"windows": "",
"darwin": "",
"linux": ""
}
},
"FLAME_WIRETAP_HOSTNAME": "",
"FLAME_WIRETAP_VOLUME": "stonefs",
"FLAME_WIRETAP_GROUP": "staff"
},
"variants": {
"2021": {
@ -502,7 +505,7 @@
"environment": {}
},
"__dynamic_keys_labels__": {
"13-0": "13.0 (Testing only)",
"13-0": "13.0",
"12-2": "12.2",
"12-0": "12.0",
"11-3": "11.3",
@ -639,7 +642,7 @@
"environment": {}
},
"__dynamic_keys_labels__": {
"13-0": "13.0 (Testing only)",
"13-0": "13.0",
"12-2": "12.2",
"12-0": "12.0",
"11-3": "11.3",