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

Merge branch 'develop' into 2.4

pull/8619/head v2.4.163
iglocska 2022-09-26 14:33:25 +02:00
parent 40ce38efec b9c3188659
commit 16bcf9fcdc
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/View/Emails/notification_common.ctp
View File

@ -523,7 +523,7 @@ array_splice($mitre_attack_techniques, 10);
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>
</div> </div>
?> <?php endif; ?>
<?php if ($this->fetch('trending-summary')) : ?> <?php if ($this->fetch('trending-summary')) : ?>
<?= $this->fetch('trending-summary'); ?> <?= $this->fetch('trending-summary'); ?>

2
app/files/scripts/misp-stix

@ -1 +1 @@
Subproject commit 0b9229ba8153a86985cc009b7c40df21e0d08b75 Subproject commit c60a6e76ccd735d460b382effee9af6aae7fa4ab