ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into extract-styleguide

Browse Source
This commit is contained in:
Grzegorz Leoniec 2019-02-21 22:37:57 +01:00 committed by GitHub
commit 58c00b59e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -46,7 +46,7 @@
"date-fns": "2.0.0-alpha.27", "date-fns": "2.0.0-alpha.27",
"express": "~4.16.4", "express": "~4.16.4",
"graphql": "~14.1.1", "graphql": "~14.1.1",
"jsonwebtoken": "~8.4.0", "jsonwebtoken": "~8.5.0",
"nuxt": "~2.4.3", "nuxt": "~2.4.3",
"nuxt-env": "~0.1.0", "nuxt-env": "~0.1.0",
"portal-vue": "~1.5.1", "portal-vue": "~1.5.1",

13
yarn.lock
View File

@ -6960,12 +6960,12 @@ jsonparse@^1.2.0:
resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
jsonwebtoken@~8.4.0: jsonwebtoken@~8.5.0:
version "8.4.0" version "8.5.0"
resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.4.0.tgz#8757f7b4cb7440d86d5e2f3becefa70536c8e46a" resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.0.tgz#ebd0ca2a69797816e1c5af65b6c759787252947e"
integrity sha512-coyXjRTCy0pw5WYBpMvWOMN+Kjaik2MwTUIq9cna/W7NpO9E+iYbumZONAz3hcr+tXFJECoQVrtmIoC3Oz0gvg== integrity sha512-IqEycp0znWHNA11TpYi77bVgyBO/pGESDh7Ajhas+u0ttkGkKYIIAjniL4Bw5+oVejVF+SYkaI7XKfwCCyeTuA==
dependencies: dependencies:
jws "^3.1.5" jws "^3.2.1"
lodash.includes "^4.3.0" lodash.includes "^4.3.0"
lodash.isboolean "^3.0.3" lodash.isboolean "^3.0.3"
lodash.isinteger "^4.0.4" lodash.isinteger "^4.0.4"
@ -6974,6 +6974,7 @@ jsonwebtoken@~8.4.0:
lodash.isstring "^4.0.1" lodash.isstring "^4.0.1"
lodash.once "^4.0.0" lodash.once "^4.0.0"
ms "^2.1.1" ms "^2.1.1"
semver "^5.6.0"
jsprim@^1.2.2: jsprim@^1.2.2:
version "1.4.1" version "1.4.1"
@ -6994,7 +6995,7 @@ jwa@^1.2.0:
ecdsa-sig-formatter "1.0.10" ecdsa-sig-formatter "1.0.10"
safe-buffer "^5.0.1" safe-buffer "^5.0.1"
jws@^3.1.5: jws@^3.2.1:
version "3.2.1" version "3.2.1"
resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.1.tgz#d79d4216a62c9afa0a3d5e8b5356d75abdeb2be5" resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.1.tgz#d79d4216a62c9afa0a3d5e8b5356d75abdeb2be5"
integrity sha512-bGA2omSrFUkd72dhh05bIAN832znP4wOU3lfuXtRBuGTbsmNmDXMQg28f0Vsxaxgk4myF5YkKQpz6qeRpMgX9g== integrity sha512-bGA2omSrFUkd72dhh05bIAN832znP4wOU3lfuXtRBuGTbsmNmDXMQg28f0Vsxaxgk4myF5YkKQpz6qeRpMgX9g==