Merge branch 'release/2.0.1'
This commit is contained in:
commit
ffd862f5f8
@ -28,7 +28,6 @@ class AdditionalConfiguration
|
|||||||
'loginRateLimit' => 10000,
|
'loginRateLimit' => 10000,
|
||||||
],
|
],
|
||||||
'GFX' => [
|
'GFX' => [
|
||||||
'processor' => 'GraphicsMagick',
|
|
||||||
'processor_colorspace' => 'RGB',
|
'processor_colorspace' => 'RGB',
|
||||||
'processor_path' => '/usr/bin/',
|
'processor_path' => '/usr/bin/',
|
||||||
'processor_path_lzw' => '/usr/bin/',
|
'processor_path_lzw' => '/usr/bin/',
|
||||||
@ -39,7 +38,7 @@ class AdditionalConfiguration
|
|||||||
'systemLogLevel' => 0,
|
'systemLogLevel' => 0,
|
||||||
'exceptionalErrors' => 12290,
|
'exceptionalErrors' => 12290,
|
||||||
'errorHandlerErrors' => E_ALL & ~(
|
'errorHandlerErrors' => E_ALL & ~(
|
||||||
E_STRICT | E_NOTICE | E_WARNING | E_COMPILE_WARNING | E_COMPILE_ERROR
|
2048 /* deprecated E_STRICT */ | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR
|
||||||
| E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR
|
| E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|||||||
@ -35,8 +35,7 @@
|
|||||||
"typo3/cms-tstemplate": "*",
|
"typo3/cms-tstemplate": "*",
|
||||||
"typo3/cms-scheduler": "*",
|
"typo3/cms-scheduler": "*",
|
||||||
|
|
||||||
"helhum/typo3-console": "*",
|
"helhum/typo3-console": "*"
|
||||||
"clickstorm/cs-seo": "*"
|
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
"typo3/cms": {
|
"typo3/cms": {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user