Skip to content

Commit bd5d3b1

Browse files
committed
Merge branch 'develop' of github.com:Tschuck/battletris into develop
2 parents d428cab + 5756489 commit bd5d3b1

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"core-js": "^3.6.5",
1414
"js-cookie": "^2.2.1",
1515
"konva": "^7.2.0",
16-
"lodash": "^4.17.20",
16+
"lodash": "^4.17.21",
1717
"ts-keycode-enum": "^1.0.6",
1818
"vue": "^2.6.11",
1919
"vue-class-component": "^7.2.3",

frontend/yarn.lock

+13-13
Original file line numberDiff line numberDiff line change
@@ -4676,9 +4676,9 @@ hoopy@^0.1.4:
46764676
integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==
46774677

46784678
hosted-git-info@^2.1.4:
4679-
version "2.8.8"
4680-
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
4681-
integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==
4679+
version "2.8.9"
4680+
resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
4681+
integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
46824682

46834683
hpack.js@^2.1.6:
46844684
version "2.1.6"
@@ -5637,10 +5637,10 @@ lodash.uniq@^4.5.0:
56375637
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
56385638
integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
56395639

5640-
lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.3:
5641-
version "4.17.20"
5642-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
5643-
integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
5640+
lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3:
5641+
version "4.17.21"
5642+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
5643+
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
56445644

56455645
log-symbols@^2.2.0:
56465646
version "2.2.0"
@@ -8090,9 +8090,9 @@ sshpk@^1.7.0:
80908090
tweetnacl "~0.14.0"
80918091

80928092
ssri@^6.0.1:
8093-
version "6.0.1"
8094-
resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
8095-
integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
8093+
version "6.0.2"
8094+
resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5"
8095+
integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==
80968096
dependencies:
80978097
figgy-pudding "^3.5.1"
80988098

@@ -8805,9 +8805,9 @@ url-loader@^2.2.0:
88058805
schema-utils "^2.5.0"
88068806

88078807
url-parse@^1.4.3, url-parse@^1.4.7:
8808-
version "1.4.7"
8809-
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
8810-
integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
8808+
version "1.5.1"
8809+
resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b"
8810+
integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==
88118811
dependencies:
88128812
querystringify "^2.1.1"
88138813
requires-port "^1.0.0"

0 commit comments

Comments
 (0)