Merge branch 'master' of github.com:MISP/misp-taxonomies

pull/125/head
Raphaël Vinot 2018-10-31 09:21:09 +01:00
commit fdf5f8ff76
2 changed files with 2 additions and 11 deletions

View File

@ -8,7 +8,7 @@
"expanded": "Technical" "expanded": "Technical"
}, },
{ {
"value": "subsription", "value": "subscription",
"expanded": "Subscription" "expanded": "Subscription"
}, },
{ {

View File

@ -41,21 +41,12 @@
} }
], ],
"values": [ "values": [
{
"predicate": "user",
"entry": []
},
{
"predicate": "application",
"entry": []
},
{ {
"predicate": "end-devices-and-components", "predicate": "end-devices-and-components",
"entry": [ "entry": [
{ {
"value": "ms", "value": "ms",
"expanded": "Mobile Station", "expanded": "Mobile Station"
"description": ""
}, },
{ {
"value": "mobile-equipment-radio", "value": "mobile-equipment-radio",