diff options
author | Jelle Spijker <j.spijker@ultimaker.com> | 2022-06-17 11:01:04 +0300 |
---|---|---|
committer | Jelle Spijker <j.spijker@ultimaker.com> | 2022-06-17 11:01:04 +0300 |
commit | f6aa40970143a2f44a8eb48bc36cfa322cdf3291 (patch) | |
tree | 6cd8a5415f84da69aed38e64e66cf3b2b8e05ba2 /conandata.yml | |
parent | f9447edf47d28bd590b184bb9df2a35d386cc69c (diff) | |
parent | 50a351149641bd435f81f09b22dbd57f723f6a34 (diff) |
Merge remote-tracking branch 'origin/5.1' into CURA-9365_fix_building_cura_main
Diffstat (limited to 'conandata.yml')
0 files changed, 0 insertions, 0 deletions