merge with 2.4.120, fix merge conflicts

2026-05-04 10:28:16 +02:00 · 2024-10-25 15:09:38 -04:00
parent 0476585370 a76a2d8e9f
commit feb700393e
520 changed files with 12109 additions and 250 deletions
@@ -211,7 +211,8 @@
      'so-desktop': [
          'ssl',
          'docker_clean',
-          'telegraf'
+          'telegraf',
+          'stig'
          ],
  }, grain='role') %}