Commit Graph

2 Commits (f6b8655f64e8d0a2e1200e3b1f44c590ccb70f34)

Author SHA1 Message Date
Richard van den Berg 3a4c540a81 Updated description to reflect merging use case 2017-01-11 10:08:35 +01:00
Richard van den Berg 50bae1f549 Simple import module to import MISP JSON format 2017-01-11 10:08:35 +01:00