Merge branch '2.4' into develop

app/Model/Attribute.php

@@ -2781,16 +2781,11 @@ class Attribute extends AppModel
             
         }
         if (!empty($tagActions['detach'])) {
-            $conditions = ['OR' => []];
             foreach ($tagActions['detach'] as $detach) {
-                $conditions['OR'][] = [
-                    'AND' => [
-                        'attribute_id' => $detach['attribute_id'],
-                        'tag_id' => $detach['tag_id']
-                    ]
+                $conditions = [
+                    'attribute_id' => $detach['attribute_id'],
+                    'tag_id' => $detach['tag_id']
                 ];
-            }
-            if (!empty($conditions)) {
                 $this->AttributeTag->deleteAll($conditions, false);
             }
         }

app/webroot/doc/openapi.yaml

@@ -1,6 +1,8 @@
-openapi: 3.0.0
+openapi: 3.1.0
+
 info:
   title: MISP Automation API
+  version: "2.4"
   description: |
 
     ### Getting Started