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

feature/publication-blocking-same-user
iglocska 2023-12-14 14:20:23 +01:00
parent d1c09533c6 34533dfbe0
commit 9db0cedc8c
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
8 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PyMISP

@ -1 +1 @@
Subproject commit cc6391233c01362a1b4b483c4ea8e67f306e3459
Subproject commit 190f82923687cebaf06138724e7c03239e529cb4

2
app/Controller/AppController.php
View File

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

BIN
app/files/geo-open/GeoOpen-Country.mmdb
View File

Binary file not shown.

2
app/files/misp-galaxy

@ -1 +1 @@
Subproject commit dbbb075b1c7154f27a096a35b483c826bdedec13
Subproject commit e5b4209f3a88147985120215eb898e563e4976af

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit c18a240153cbe9ef68e46f05565d08653c2ad103
Subproject commit 587b298e1e7f87426182d55d44aa045a1522dc98

2
app/files/scripts/misp-stix

@ -1 +1 @@
Subproject commit 5b678c26b95e0f34ad4515292f09e192aa0e4730
Subproject commit 260920bf7c9d8f678b0d69730acb17e9a34811f2

2
app/files/warninglists

@ -1 +1 @@
Subproject commit fbf99aae8f054072d0d3097f04d9f81e12835bdc
Subproject commit e7255574c79b946365fdd066429d822730010726

2
requirements.txt
View File

@ -6,7 +6,7 @@ misp-lib-stix2>=3.0.1.1
mixbox>=1.0.5
plyara>=2.1.1
pydeep2>=0.5.1
pymisp==2.4.179
pymisp==2.4.182
python-magic>=0.4.27
pyzmq>=25.1.1
redis>=5.0.1