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' of https://github.com/Ocelot-Social-Community/Ocelot-Social into dependabot/npm_and_yarn/webapp/v-tooltip-2.1.3

Browse Source 
# Conflicts:
#	webapp/package-lock.json
This commit is contained in:
Wolfgang Huß 2021-07-25 12:43:37 +02:00
commit a201f55211
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/package.json
View File

@ -130,7 +130,7 @@
"eslint-config-standard": "~14.1.1",
"eslint-loader": "~4.0.0",
"eslint-plugin-import": "~2.20.2",
"eslint-plugin-jest": "~24.1.3",
"eslint-plugin-jest": "~24.4.0",
"eslint-plugin-node": "~11.1.0",
"eslint-plugin-prettier": "~3.1.4",
"eslint-plugin-promise": "~4.3.1",

8
webapp/yarn.lock
View File

@ -7977,10 +7977,10 @@ eslint-plugin-import@~2.20.2:
read-pkg-up "^2.0.0"
resolve "^1.12.0"
eslint-plugin-jest@~24.1.3:
version "24.1.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.1.3.tgz#fa3db864f06c5623ff43485ca6c0e8fc5fe8ba0c"
integrity sha512-dNGGjzuEzCE3d5EPZQ/QGtmlMotqnYWD/QpCZ1UuZlrMAdhG5rldh0N0haCvhGnUkSeuORS5VNROwF9Hrgn3Lg==
eslint-plugin-jest@~24.4.0:
version "24.4.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz#fa4b614dbd46a98b652d830377971f097bda9262"
integrity sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg==
dependencies:
"@typescript-eslint/experimental-utils" "^4.0.1"