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/7984/head
iglocska 2021-11-21 17:14:29 +01:00
parent ec70caeb61 a39d18de0e
commit 6c4ac76ef2
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit f85ccb3e19cd3aec3c694ccfa4be97fffb9597f8
Subproject commit 8b66d5f75346271c78d4737f79fb302e17c961d2

2
app/Controller/AppController.php
View File

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

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit 0f0093ba4b59e469c0e75bd15415ccddc679e4c7
Subproject commit d2606f6688a5e63b49c9bf472cbee67a163f1c34

2
app/files/taxonomies

@ -1 +1 @@
Subproject commit 16214e18672d620a6fa1c2e371b662d5984df8e9
Subproject commit 0aacfdc980a66d511f6d225935d334b752d41d26

2
app/files/warninglists

@ -1 +1 @@
Subproject commit ea53651d3ddd60a313180b2f03252df3205ad9ff
Subproject commit 3637925e8f2d9807f8af41a07f23e7b14e4a5a53