Merge branch 'MISP:main' into master

pull/343/head
Alexandre De Oliveira 2022-01-19 17:57:48 +01:00 committed by GitHub
commit 7c88589d6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions

View File

@ -15,6 +15,7 @@
"BlackBerry Messenger", "BlackBerry Messenger",
"TeamSpeak", "TeamSpeak",
"TorChat", "TorChat",
"Tox",
"RetroShare", "RetroShare",
"Slack" "Slack"
], ],
@ -76,5 +77,5 @@
"attachment" "attachment"
], ],
"uuid": "e26becca-2149-4bc0-b3fb-7090d43af28f", "uuid": "e26becca-2149-4bc0-b3fb-7090d43af28f",
"version": 1 "version": 2
} }

View File

@ -14,6 +14,7 @@
"BlackBerry Messenger", "BlackBerry Messenger",
"TeamSpeak", "TeamSpeak",
"TorChat", "TorChat",
"Tox",
"RetroShare", "RetroShare",
"Slack" "Slack"
], ],
@ -108,5 +109,5 @@
"from-user" "from-user"
], ],
"uuid": "5fa51a24-f40f-4696-a77e-d31e26bab5fc", "uuid": "5fa51a24-f40f-4696-a77e-d31e26bab5fc",
"version": 1 "version": 2
} }

View File

@ -15,7 +15,8 @@
"disable_correlation": true, "disable_correlation": true,
"misp-attribute": "text", "misp-attribute": "text",
"sane_default": [ "sane_default": [
"stix 2.0" "stix 2.0",
"stix 2.1"
], ],
"ui-priority": 0 "ui-priority": 0
} }
@ -27,5 +28,5 @@
"stix2-pattern" "stix2-pattern"
], ],
"uuid": "0c5bd072-7c3e-4d45-86f7-a8104d9143b9", "uuid": "0c5bd072-7c3e-4d45-86f7-a8104d9143b9",
"version": 3 "version": 4
} }