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

2018-07-11 15:02:47 +02:00 · 2018-07-11 15:02:47 +02:00 · 3fb8269fce
parent 90a8e9110b ef4345ef5b
commit 3fb8269fce
7 changed files with 42955 additions and 4792 deletions
--- a/app/Locale/cake_dev.pot
+++ b/app/Locale/cake_dev.pot
@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

-#: Controller/AppController.php:424
+#: Controller/AppController.php:437
 msgid "The request has been black-holed"
 msgstr ""

--- a/app/Locale/default.pot
+++ b/app/Locale/default.pot
--- a/app/Locale/fra/LC_MESSAGES/default.po
+++ b/app/Locale/fra/LC_MESSAGES/default.po
--- a/app/Locale/ita/LC_MESSAGES/default.po
+++ b/app/Locale/ita/LC_MESSAGES/default.po
--- a/app/Locale/jpn/LC_MESSAGES/default.po
+++ b/app/Locale/jpn/LC_MESSAGES/default.po
--- a/app/Locale/kor/LC_MESSAGES/default.po
+++ b/app/Locale/kor/LC_MESSAGES/default.po
--- a/app/Locale/pt_BR/LC_MESSAGES/default.po
+++ b/app/Locale/pt_BR/LC_MESSAGES/default.po