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

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

pull/5705/head v2.4.123
iglocska 2020-03-10 15:11:39 +01:00
parent 9c36d5292c 69c24c5d11
commit eaf50ed47e
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -131,7 +131,6 @@ install:
- pip install .[fileobjects]
- popd
- pip install stix zmq redis plyara
- pip install -I antlr4-python3-runtime==4.7.2 # antlr4-python3-runtime==4.8 causes issues
- deactivate
before_script:

2
PyMISP

@ -1 +1 @@
Subproject commit 3ee08b9c2634e132ec7d5b15aba9d6c940ee34c6
Subproject commit 64d7c9a24ad9d3a7ccc1b96fb643c235d2b9e02e

2
app/Controller/AppController.php
View File

@ -47,7 +47,7 @@ class AppController extends Controller
public $helpers = array('Utility', 'OrgImg', 'FontAwesome', 'UserName');
private $__queryVersion = '101';
public $pyMispVersion = '2.4.122';
public $pyMispVersion = '2.4.123';
public $phpmin = '7.2';
public $phprec = '7.4';
public $pythonmin = '3.6';

2
cti-python-stix2

@ -1 +1 @@
Subproject commit 96946d956d41b4c9c9b24683add88f457181ee75
Subproject commit 77ca5ae2f9742652cd90a53f1b83308a8343f2cc