Commit e6a120b0 authored by Harry Glatz's avatar Harry Glatz
Browse files

Merge branch 'develop' into 'updateextlayout'

# Conflicts:
#   composer.lock
parents be8078de 633cf630
Pipeline #456 passed with stages
in 2 minutes and 29 seconds
......@@ -28,12 +28,12 @@ build:
layout:
stage: layout
image: montoias/docker-nodejs-bower-grunt-compass:v2
image: node:7
before_script:
- cd html/typo3conf/ext/t3olayout/Resources/Private
- cd html/typo3conf/ext/t3olayout/Build
script:
- npm install
- grunt
- npm install
- npm run build
artifacts:
paths:
- ./
......
......@@ -1925,4 +1925,4 @@
"prefer-lowest": false,
"platform": [],
"platform-dev": []
}
}
\ No newline at end of file
......@@ -22,6 +22,7 @@ return [
'EXT' => [
'extConf' => [
'rsaauth' => 'a:1:{s:18:"temporaryDirectory";s:0:"";}',
'rte_ckeditor' => 'a:0:{}',
'saltedpasswords' => 'a:2:{s:3:"BE.";a:4:{s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}s:3:"FE.";a:5:{s:7:"enabled";i:1;s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}}',
't3olayout' => 'a:0:{}',
],
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment