MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

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

pull/8906/head
Sami Mokaddem 2023-01-25 11:51:49 +01:00
parent 6aa5f32215 4a3964880d
commit b074a4c1d9
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit b4f305a077920e969f84db5c8c3dc42b6515a0d4
Subproject commit 9a7adb2e0d60d2edee9f541db808652875bae20e

2
app/Controller/AppController.php
View File

@ -34,7 +34,7 @@ class AppController extends Controller
public $helpers = array('OrgImg', 'FontAwesome', 'UserName');
private $__queryVersion = '146';
public $pyMispVersion = '2.4.167';
public $pyMispVersion = '2.4.168';
public $phpmin = '7.2';
public $phprec = '7.4';
public $phptoonew = '8.0';

2
app/files/misp-galaxy

@ -1 +1 @@
Subproject commit ac1242a40e3a165ea664f3a8640dc346a5877c3a
Subproject commit f605f041d99057b767231831d7f5970be6c1fcb9

2
app/files/scripts/misp-stix

@ -1 +1 @@
Subproject commit c60a6e76ccd735d460b382effee9af6aae7fa4ab
Subproject commit 93da9ae3a468f1beacc7edbfe241e6df89b94250

2
app/files/taxonomies

@ -1 +1 @@
Subproject commit e4d0c58076c2c1af20491b1d9be56967a16ac515
Subproject commit 14f1349fad189091960311018a4cabcb1018adb9

2
app/files/warninglists

@ -1 +1 @@
Subproject commit 3a059f8bd95360837ab3fe96830a4af6c2869372
Subproject commit a51a9adc6c693bd5d2bf83f49920df7247ced298