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

more merge fixes

pull/5974/head
Vito Piserchia 2020-08-16 13:44:53 +02:00
parent b8c7485712
commit a1c80378f6
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/EventsController.php
View File

@ -4099,8 +4099,6 @@ class EventsController extends AppController
'OpenIOC' => array(
'url' => $baseurl . '/events/addIOC/' . $id,
'text' => __('OpenIOC Import'),
'url' => $baseurl . '/events/addIOC/' . $id,
'text' => 'OpenIOC Import',
'ajax' => false,
),
'ThreatConnect' => array(

2
app/View/Elements/global_menu.ctp
View File

@ -43,7 +43,7 @@
'url' => $baseurl . '/events/proposalEventIndex'
),
array(
'url' => '/event_delegations/index/context:pending',
'url' => $baseurl . '/event_delegations/index/context:pending',
'text' => __('View delegation requests')
),
array(