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

pull/3144/head
iglocska 2018-04-09 13:59:17 +02:00
commit 9ba1af9645
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit 4996ebb4a2ebbf70ddb2714b32458d62fcd0d5c1
Subproject commit 3f93daa0664629e75329e821800a564495ada026