Deborah Servili 2081dc1627 resolve merge confilct -I hope-		2018-08-14 12:06:42 +02:00
..
android.json	fix typo and missing uuid	2018-08-14 11:41:06 +02:00
backdoor.json	resolve merge confilct -I hope-	2018-08-14 12:06:42 +02:00
banker.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
botnet.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
branded_vulnerability.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
cert-eu-govsector.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
exploit-kit.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
microsoft-activity-group.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
mitre-attack-pattern.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
mitre-course-of-action.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
mitre-enterprise-attack-attack-pattern.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
mitre-enterprise-attack-course-of-action.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
mitre-enterprise-attack-intrusion-set.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
mitre-enterprise-attack-malware.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
mitre-enterprise-attack-relationship.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
mitre-enterprise-attack-tool.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
mitre-intrusion-set.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
mitre-malware.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
mitre-mobile-attack-attack-pattern.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
mitre-mobile-attack-course-of-action.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
mitre-mobile-attack-intrusion-set.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
mitre-mobile-attack-malware.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
mitre-mobile-attack-relationship.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
mitre-mobile-attack-tool.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
mitre-pre-attack-attack-pattern.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
mitre-pre-attack-intrusion-set.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
mitre-pre-attack-relationship.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
mitre-tool.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
preventive-measure.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
ransomware.json	resolve merge confilct -I hope-	2018-08-14 12:06:42 +02:00
rat.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
sector.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
stealer.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
tds.json	no change: dump files with sort_keys=True	2018-08-13 17:06:29 +02:00
threat-actor.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00
tool.json	chg: [mapping] Generated automatic mapping between clusters	2018-08-14 09:35:22 +02:00