Skip to content

Commit

Permalink
Merge branch 'ember-cli:master' into feature/preserve-test-name
Browse files Browse the repository at this point in the history
  • Loading branch information
tasha-urbancic authored Aug 23, 2022
2 parents 5cd11ba + fd75a89 commit 2a6d6f9
Show file tree
Hide file tree
Showing 2 changed files with 530 additions and 515 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@
"ember-load-initializers": "2.1.2",
"ember-qunit": "5.1.5",
"ember-resolver": "8.0.3",
"ember-source": "4.5.0",
"ember-source": "4.6.0",
"ember-source-channel-url": "3.0.0",
"ember-template-lint": "4.10.1",
"ember-template-lint": "4.12.0",
"ember-try": "1.4.0",
"eslint": "7.32.0",
"eslint-config-prettier": "8.5.0",
Expand All @@ -101,7 +101,7 @@
"rsvp": "4.8.5",
"sinon": "14.0.0",
"testdouble": "3.16.6",
"webpack": "5.73.0"
"webpack": "5.74.0"
},
"peerDependencies": {
"ember-mocha": "*",
Expand Down Expand Up @@ -149,7 +149,7 @@
}
},
"volta": {
"node": "16.16.0",
"node": "16.17.0",
"yarn": "1.22.19"
},
"ember": {
Expand Down
Loading

0 comments on commit 2a6d6f9

Please sign in to comment.