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

Merge branch 'develop' of github.com:MISP/MISP into improvements-sync-filter-rules

pull/7354/head
mokaddem 2021-04-22 10:46:41 +02:00
parent 50ccc022e1 86088ab0ea
commit f6f6b102f6
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
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/Controller/FeedsController.php
View File

@ -395,7 +395,7 @@ class FeedsController extends AppController
} else {
$message = __('Feed could not be updated. Reason: %s', json_encode($this->Feed->validationErrors));
if ($this->_isRest()) {
return $this->RestResponse->saveFailResponse('Feeds', 'add', false, $message, $this->response->type());
return $this->RestResponse->saveFailResponse('Feeds', 'edit', false, $message, $this->response->type());
}
$this->Flash->error($message);
}

2
app/files/warninglists

@ -1 +1 @@
Subproject commit 892ac72da4efc81531003102d5b3af446ebb44a5
Subproject commit 52b3824981309063f1d3e44d7a7cf3f75f110070