Merge branch 'master' of github.com:MISP/PyMISP

2018-08-06 23:50:48 +02:00 · 2018-08-06 23:50:48 +02:00 · f0b094f7b3
parent 38f3867fc1 5d16c97178
commit f0b094f7b3
1 changed files with 2 additions and 1 deletions
--- a/pymisp/data/describeTypes.json
+++ b/pymisp/data/describeTypes.json
@ -1018,7 +1018,8 @@
        "x509-fingerprint-sha1",
        "other",
        "hex",
-        "cookie"
+        "cookie",
+        "hostname|port"
      ],
      "Payload type": [
        "comment",