Skip to content

Commit d6efcf3

Browse files
committed
Merge branch '2' into 3
# Conflicts: # yarn.lock
2 parents de2d84c + ee22a35 commit d6efcf3

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -6374,16 +6374,16 @@ expose-loader@^4.0.0:
63746374
integrity sha512-oLAesnzerwDGGADzBMnu0LPqqnlVz6e2V9lTa+/4X6VeW9W93x/nJpw05WBrcIdbqXm/EdnEQpiVDFFiQXuNfg==
63756375

63766376
express@^4.17.3:
6377-
version "4.21.1"
6378-
resolved "https://registry.yarnpkg.com/express/-/express-4.21.1.tgz#9dae5dda832f16b4eec941a4e44aa89ec481b281"
6379-
integrity sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==
6377+
version "4.21.0"
6378+
resolved "https://registry.yarnpkg.com/express/-/express-4.21.0.tgz#d57cb706d49623d4ac27833f1cbc466b668eb915"
6379+
integrity sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==
63806380
dependencies:
63816381
accepts "~1.3.8"
63826382
array-flatten "1.1.1"
63836383
body-parser "1.20.3"
63846384
content-disposition "0.5.4"
63856385
content-type "~1.0.4"
6386-
cookie "0.7.1"
6386+
cookie "0.6.0"
63876387
cookie-signature "1.0.6"
63886388
debug "2.6.9"
63896389
depd "2.0.0"

0 commit comments

Comments
 (0)