Commit 70c28a1a authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch 'T3OUpdate' into 'develop'

T3 o update

See merge request !67
parents 50b1b0a7 cbc4a9e5
Pipeline #428 passed with stages
in 2 minutes and 34 seconds
...@@ -27,12 +27,12 @@ build: ...@@ -27,12 +27,12 @@ build:
layout: layout:
stage: layout stage: layout
image: montoias/docker-nodejs-bower-grunt-compass:v2 image: node:7
before_script: before_script:
- cd html/typo3conf/ext/t3olayout/Resources/Private - cd html/typo3conf/ext/t3olayout/Build
script: script:
- npm install - npm install
- grunt - npm run build
artifacts: artifacts:
paths: paths:
- ./ - ./
......
...@@ -1037,7 +1037,7 @@ ...@@ -1037,7 +1037,7 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git-t3o.typo3.org/t3o/t3olayout.git", "url": "https://git-t3o.typo3.org/t3o/t3olayout.git",
"reference": "cc3c1f6d14ff8fb4509bcc6b7637583125c2a7a7" "reference": "44d499c6d670114a60f99c79bf13c4cd2c96092e"
}, },
"type": "typo3-cms-extension", "type": "typo3-cms-extension",
"autoload": { "autoload": {
...@@ -1053,7 +1053,7 @@ ...@@ -1053,7 +1053,7 @@
"keywords": [ "keywords": [
"TYPO3 CMS" "TYPO3 CMS"
], ],
"time": "2017-04-21 06:58:14" "time": "2017-04-28 08:12:23"
}, },
{ {
"name": "typo3/class-alias-loader", "name": "typo3/class-alias-loader",
......
Markdown is supported
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