MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

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

pull/4138/head
iglocska 2019-02-11 10:56:24 +01:00
parent 379d0ea92d 124522e09a
commit 4a6ed2f56a
2 changed files with 182 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/View/Events/view.ctp
View File

@ -86,6 +86,7 @@
)
);
}
}
if (!empty($contributors)) {
$contributorsContent = '';
foreach ($contributors as $k => $entry) {
@ -291,7 +292,6 @@
);
}
}
}
?>
<div class="row-fluid">

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit 75ae30f44df997280255eec60b981b9f376c5ac4
Subproject commit f9bb8bfa9bfe0eb3813df4dc5efa355bece53ce7