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

Merge branch 'hotfix-2.3.46'

pull/400/head
iglocska 2015-02-05 17:26:51 +01:00
parent 9cc7a994c3 12d7025bce
commit 19dac1faaf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":45}
{"major":2, "minor":3, "hotfix":46}

2
app/Controller/EventsController.php
View File

@ -3080,7 +3080,7 @@ class EventsController extends AppController {
'checkbox_set' => '/true'
),
'json' => array(
'url' => '/events/view/' . $id . 'json',
'url' => '/events/view/' . $id . '.json',
'text' => 'MISP JSON (metadata + all attributes)',
'requiresPublished' => false,
'checkbox' => false,