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

pull/1994/merge
iglocska 2018-05-11 06:16:32 +02:00
commit bced9ff59f
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit 3382e18393781c2802b4fecde9662c87a78e47de
Subproject commit b5f352e8c219f41557609bd9a1dcccea59a7d89a