IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into admin-tags-and-categories

Browse Source
This commit is contained in:
Robert Schäfer 2018-12-13 13:16:51 +01:00 committed by GitHub
commit 2c463fdeaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -73,7 +73,7 @@
"nuxt-sass-resources-loader": "^2.0.5", "nuxt-sass-resources-loader": "^2.0.5",
"prettier": "1.14.3", "prettier": "1.14.3",
"sass-loader": "^7.1.0", "sass-loader": "^7.1.0",
"vue-jest": "^3.0.0", "vue-jest": "^3.0.2",
"vue-svg-loader": "^0.11.0" "vue-svg-loader": "^0.11.0"
} }
} }

8
yarn.lock
View File

@ -11563,10 +11563,10 @@ vue-izitoast@1.1.2:
dependencies: dependencies:
izitoast "^1.3.0" izitoast "^1.3.0"
vue-jest@^3.0.0: vue-jest@^3.0.2:
version "3.0.1" version "3.0.2"
resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.1.tgz#127cded1a57cdfcf01fa8a10ce29579e2cb3a04d" resolved "https://registry.yarnpkg.com/vue-jest/-/vue-jest-3.0.2.tgz#c64bf5da9abd0d3ee16071217037696d14b0689c"
integrity sha512-otS+n341cTsp0pF7tuTu2x43b23x/+K0LZdAXV+ewKYIMZRqhuQaJTECWEt/cN/YZw2JC6hUM6xybdnOB4ZQ+g== integrity sha512-5XIQ1xQFW0ZnWxHWM7adVA2IqbDsdw1vhgZfGFX4oWd75J38KIS3YT41PtiE7lpMLmNM6+VJ0uprT2mhHjUgkA==
dependencies: dependencies:
babel-plugin-transform-es2015-modules-commonjs "^6.26.0" babel-plugin-transform-es2015-modules-commonjs "^6.26.0"
chalk "^2.1.0" chalk "^2.1.0"