Commit b1e24a0a authored by jfriedli's avatar jfriedli
Browse files

Merge branch 'develop' into 'master'

Prepare 1.3

See merge request jfriedli/mat2-quasar-frontend!130
parents accaf649 42480b54
Pipeline #31528 passed with stages
in 53 minutes and 42 seconds
......@@ -312,7 +312,7 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-optional-catch-binding" "^7.2.0"
 
"@babel/plugin-proposal-optional-chaining@^7.7.4":
"@babel/plugin-proposal-optional-chaining@7.7.4":
version "7.7.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.7.4.tgz#3f04c2de1a942cbd3008324df8144b9cbc0ca0ba"
integrity sha512-JmgaS+ygAWDR/STPe3/7y0lNlHgS+19qZ9aC06nYLwQ/XB7c0q5Xs+ksFU3EDnp9EiEsO0dnRAOKeyLHTZuW3A==
......@@ -1744,10 +1744,10 @@
source-map "~0.6.1"
vue-template-es2015-compiler "^1.9.0"
 
"@vue/eslint-config-standard@5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@vue/eslint-config-standard/-/eslint-config-standard-5.0.0.tgz#2ffabb4056205a86782cd5a641cdbcd330d905b4"
integrity sha512-t1mQIqtoQ3FsAx/8RnzT9VCCdbKD0O1pzvVzsN5WrIVIgos5RVII7aSTdh3HjAVn5+UmWLnG/OK+fow4EY7YsA==
"@vue/eslint-config-standard@5.0.1":
version "5.0.1"
resolved "https://registry.yarnpkg.com/@vue/eslint-config-standard/-/eslint-config-standard-5.0.1.tgz#0ffe65368cd45516498d581457098c69d9173cbe"
integrity sha512-8QHYlaGcO1/0IDe0JpzF6DHsQgzHUCqnrBhsX+Y9NmM81ek5XWrxzKfoMQbNXnvy69D/NzI3+a4incYAR36J0A==
dependencies:
eslint-config-standard "^14.1.0"
 
......
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