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

pull/7600/head
Alexandre Dulaunoy 2021-07-25 09:15:28 +02:00
commit 4455d1b1b4
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
2 changed files with 2 additions and 2 deletions

@ -1 +1 @@
Subproject commit 212e4102586a34b523e53c926a5313050dcb478d
Subproject commit 8ecdd68eb881d6b5c565ad3a46b62143044a0b27

@ -1 +1 @@
Subproject commit 29192e0b2074a4af3f861b0a88af2e4da988a202
Subproject commit 9aa99012c7945ba0de164642704260c112aba4a4