Merge branch 'main' of github.com:MISP/PyMISP into main

pull/646/head
Raphaël Vinot 2020-10-16 13:01:29 +02:00
commit 8392a84c83
1 changed files with 4 additions and 1 deletions

View File

@ -127,6 +127,7 @@
"comment", "comment",
"community-id", "community-id",
"cortex", "cortex",
"cpe",
"domain", "domain",
"domain|ip", "domain|ip",
"filename", "filename",
@ -271,6 +272,7 @@
"cdhash", "cdhash",
"chrome-extension-id", "chrome-extension-id",
"comment", "comment",
"cpe",
"domain", "domain",
"email", "email",
"email-attachment", "email-attachment",
@ -366,6 +368,7 @@
"cdhash", "cdhash",
"chrome-extension-id", "chrome-extension-id",
"comment", "comment",
"cpe",
"filename", "filename",
"filename-pattern", "filename-pattern",
"filename|authentihash", "filename|authentihash",
@ -603,7 +606,7 @@
"to_ids": 0 "to_ids": 0
}, },
"cpe": { "cpe": {
"default_category": "Other", "default_category": "External analysis",
"to_ids": 0 "to_ids": 0
}, },
"dash": { "dash": {