Merge branch '2.4' of github.com:MISP/MISP into 2.4

pull/3778/head
iglocska 2018-10-17 12:32:19 +02:00
commit 457e342cc6
1 changed files with 1 additions and 0 deletions

View File

@ -299,6 +299,7 @@ domain_pattern_mapping = {'value': {'type': 'domain'}}
ip_pattern_mapping = {'value': {'type': 'ip-dst'}}
external_pattern_mapping = {'domain-name': domain_pattern_mapping,
'email-addr': {'value': {'type': 'email-dst'}}
'file': file_mapping,
'ipv4-addr': ip_pattern_mapping,
'ipv6-addr': ip_pattern_mapping,