Skip to content

Commit 9bdceee

Browse files
authored
Merge branch 'develop' into nikolovlazar/agnostic-tunnel-handler
2 parents 81e14fb + 0784fdb commit 9bdceee

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

packages/ember/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
"ember-cli-terser": "~4.0.2",
6767
"ember-load-initializers": "~2.1.1",
6868
"ember-qunit": "~8.1.0",
69-
"ember-resolver": "13.0.2",
69+
"ember-resolver": "13.1.1",
7070
"ember-sinon-qunit": "7.5.0",
7171
"ember-source": "~4.12.4",
7272
"ember-template-lint": "~4.16.1",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15885,10 +15885,10 @@ ember-qunit@~8.1.0:
1588515885
ember-cli-test-loader "^3.1.0"
1588615886
qunit-theme-ember "^1.0.0"
1588715887

15888-
ember-resolver@13.0.2:
15889-
version "13.0.2"
15890-
resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-13.0.2.tgz#c50269b35b0faef6b95d959e45768fab0536149c"
15891-
integrity sha512-9G8CVjjI4Q6vx2+FYg8YeLu+/fP4eBL/1+qp5bzwtXQ7G3xkg0YRpcufIdsBjf5K2SUStU83qhNH2O6aanf3nw==
15888+
ember-resolver@13.1.1:
15889+
version "13.1.1"
15890+
resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-13.1.1.tgz#9f26955c1c689dca2279fe69fccb82f5b2e9382e"
15891+
integrity sha512-rA4RDuTm/F9AzYX2+g7EY3QWU48kyF9+Ck8IE8VQipnlwv2Q42kdRWiw7hfeQbRxx6XoSZCak6nzAG9ePd/+Ug==
1589215892
dependencies:
1589315893
ember-cli-babel "^7.26.11"
1589415894

0 commit comments

Comments
 (0)