Merge branch 'master' into develop

This commit is contained in:
Pierre Rudloff 2017-04-02 23:21:02 +02:00
commit 49b38fa318

View file

@ -10,7 +10,7 @@ script: vendor/bin/phpunit
after_success: after_success:
- bash <(curl -s https://codecov.io/bash) - bash <(curl -s https://codecov.io/bash)
before_deploy: before_deploy:
- npm install - npm install --ignore-scripts
- ./node_modules/.bin/grunt doc - ./node_modules/.bin/grunt doc
deploy: deploy:
provider: surge provider: surge