Merge branch 'dev' of http://git.verdnatura.es/salix into dev

This commit is contained in:
Carlos Jimenez 2018-08-14 08:51:50 +02:00
commit 3916c2bf09
1 changed files with 1 additions and 1 deletions

View File

@ -1,6 +1,6 @@
extends: [eslint:recommended, google, plugin:jasmine/recommended] extends: [eslint:recommended, google, plugin:jasmine/recommended]
parserOptions: parserOptions:
ecmaVersion: 2017 ecmaVersion: 2018
plugins: plugins:
- jasmine - jasmine
env: env: