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/9715/head
iglocska 2024-04-23 13:23:04 +02:00
parent 7c5d052105 a12f21ff61
commit b46d5a433e
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/AppController.php
View File

@ -33,7 +33,7 @@ class AppController extends Controller
public $helpers = array('OrgImg', 'FontAwesome', 'UserName');
private $__queryVersion = '161';
private $__queryVersion = '162';
public $pyMispVersion = '2.4.190';
public $phpmin = '7.2';
public $phprec = '7.4';

1
app/webroot/css/workflows-editor.css
View File

@ -7,6 +7,7 @@
height: calc(100vh - 2*42px); /* total space available minus header and footer */
margin-top: -8px;
flex-direction: column;
width: 100%;
}
.topbar {