Skip to content

Commit 1db6e59

Browse files
committed
Merge branch 'master' into feature/fastboot-testing-app-#831
# Conflicts: # .github/workflows/ci.yml
2 parents 256f4a5 + b6b17af commit 1db6e59

File tree

3 files changed

+6
-94
lines changed

3 files changed

+6
-94
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 94 deletions
This file was deleted.

packages/ember-cli-fastboot/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"body-parser": "^1.18.3",
4747
"broccoli-asset-rev": "^3.0.0",
4848
"broccoli-test-helper": "^1.5.0",
49+
"co": "4.6.0",
4950
"chai": "^4.1.2",
5051
"chai-fs": "^2.0.0",
5152
"chai-string": "^1.4.0",

yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6293,6 +6293,11 @@ clone@^2.0.0, clone@^2.1.2:
62936293
resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
62946294
integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
62956295

6296+
6297+
version "4.6.0"
6298+
resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
6299+
integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=
6300+
62966301
code-point-at@^1.0.0:
62976302
version "1.1.0"
62986303
resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"

0 commit comments

Comments
 (0)