Merge branch 'develop' of github.com:MISP/MISP into develop

iglocska · iglocska · commit 75b0e2a26241 · 2024-08-21T11:24:20.000+02:00
diff --git a/app/Controller/AppController.php b/app/Controller/AppController.php
@@ -34,7 +34,7 @@ class AppController extends Controller
     public $helpers = array('OrgImg', 'FontAwesome', 'UserName');
 
     private $__queryVersion = '163';
-    public $pyMispVersion = '2.4.195';
+    public $pyMispVersion = '2.4.196';
     public $phpmin = '7.2';
     public $phprec = '7.4';
     public $phptoonew = '8.0';
diff --git a/app/files/scripts/misp-stix b/app/files/scripts/misp-stix
@@ -1 +1 @@
-Subproject commit 16879a4da526c012bb78ff400ded4a0550b7f470
+Subproject commit 7220ab83598626172206541f3f45db73eb23084b
diff --git a/requirements.txt b/requirements.txt
@@ -7,7 +7,7 @@ misp-stix>=2.4.194
 mixbox>=1.0.5
 plyara>=2.1.1
 pydeep2>=0.5.1
-pymisp==2.4.195
+pymisp==2.4.196
 python-magic>=0.4.27
 pyzmq>=25.1.1
 redis>=5.0.1
