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/8530/head
iglocska 2022-08-05 15:23:20 +02:00
parent 98878c39c8 a0ace85242
commit c2e169fdc1
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -50,6 +50,8 @@ app/Lib/EventWarning/Custom/*
!/app/files/misp-objects/*
!/app/files/misp-decaying-models
!/app/files/misp-decaying-models/*
!/app/files/misp-workflow-blueprints
!/app/files/misp-workflow-blueprints/*
/app/files/scripts/*.pyc
/app/files/scripts/*.py~
/app/files/scripts/__pycache__

3
.gitmodules vendored
View File

@ -48,3 +48,6 @@
[submodule "app/files/scripts/python-maec"]
path = app/files/scripts/python-maec
url = https://github.com/MAECProject/python-maec
[submodule "app/files/misp-workflow-blueprints"]
path = app/files/misp-workflow-blueprints
url = https://github.com/MISP/misp-workflow-blueprints

1
app/files/misp-workflow-blueprints Submodule

@ -0,0 +1 @@
Subproject commit 115b18decf8a5a6af0191301193d4b6607dbfc1a

2
app/files/scripts/misp-stix

@ -1 +1 @@
Subproject commit 95c141f34cbae22ce25648f4cb58027f2ccdf1f9
Subproject commit 0b9229ba8153a86985cc009b7c40df21e0d08b75