Merge branch 'master' of https://github.com/oasis-open/cti-python-stix2 into fix_issue_363
commit
a7e9a7dde5
|
@ -770,7 +770,7 @@ class Software(_Observable):
|
||||||
('granular_markings', ListProperty(GranularMarking)),
|
('granular_markings', ListProperty(GranularMarking)),
|
||||||
('defanged', BooleanProperty(default=lambda: False)),
|
('defanged', BooleanProperty(default=lambda: False)),
|
||||||
])
|
])
|
||||||
_id_contributing_properties = ["name", "cpe", "vendor", "version"]
|
_id_contributing_properties = ["name", "cpe", "swid", "vendor", "version"]
|
||||||
|
|
||||||
|
|
||||||
class URL(_Observable):
|
class URL(_Observable):
|
||||||
|
|
Loading…
Reference in New Issue