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

pull/3144/head
iglocska 2018-04-08 23:12:29 +02:00
commit 403f904a80
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit f4d7fe01666607c5606ab11da81a8054974e886a
Subproject commit aae536497c673583314dad8aa498bebc3b31ecc0