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

pull/2697/head
iglocska 2017-11-24 12:02:19 +01:00
commit 8279d2d0c8
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit 59edaa978f92015e56efde291baedb8c0f74d888
Subproject commit b83616d520dbfaca6f312a3ff54a53aedc8dc5d5