Merge branch 'master' into completion

pull/62/head
Felix Becker 2017-02-03 13:26:42 +01:00 committed by GitHub
commit 77757e7fa8
1 changed files with 3 additions and 3 deletions

View File

@ -5,8 +5,8 @@ php:
cache: cache:
directories: directories:
- node_modules - $HOME/.npm
- vendor - $HOME/.composer/cache
before_install: before_install:
- nvm install 6.5.0 - nvm install 6.5.0
@ -14,7 +14,7 @@ before_install:
install: install:
- npm install - npm install
- composer install - composer install --prefer-dist
script: script:
- npm run lint - npm run lint