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

Merge branch 'develop' into 2.4

pull/7694/head v2.4.148
iglocska 2021-08-05 12:07:14 +02:00
parent ddc4bbdca7 ade3d78d98
commit 96b4f86c62
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit ee8e9398daf05f88c79c2014a7fe29eb776e39b5
Subproject commit ad354a25662e69542b1f44b4b20dc654b785ec43

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":4, "hotfix":147}
{"major":2, "minor":4, "hotfix":148}

2
app/Controller/AppController.php
View File

@ -27,7 +27,7 @@ class AppController extends Controller
public $helpers = array('OrgImg', 'FontAwesome', 'UserName', 'DataPathCollector');
private $__queryVersion = '130';
public $pyMispVersion = '2.4.144';
public $pyMispVersion = '2.4.148';
public $phpmin = '7.2';
public $phprec = '7.4';
public $phptoonew = '8.0';