Commit Graph

2 Commits (e0631c9651ed5bcb31ad6af9529dea53119b1d56)

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