Skip to content

Commit 6a85734

Browse files
committed
Merge branch 'beta'
2 parents c53c266 + 9cbfd98 commit 6a85734

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

tests/fixtures/addon/npm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"ember-load-initializers": "^1.0.0",
4141
"ember-maybe-import-regenerator": "^0.1.6",
4242
"ember-resolver": "^4.0.0",
43-
"ember-source": "~3.0.0-beta.1",
43+
"ember-source": "~3.0.0",
4444
"ember-source-channel-url": "^1.0.1",
4545
"ember-try": "^0.2.23",
4646
"eslint-plugin-ember": "^5.0.0",

tests/fixtures/addon/yarn/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"ember-load-initializers": "^1.0.0",
4141
"ember-maybe-import-regenerator": "^0.1.6",
4242
"ember-resolver": "^4.0.0",
43-
"ember-source": "~3.0.0-beta.1",
43+
"ember-source": "~3.0.0",
4444
"ember-source-channel-url": "^1.0.1",
4545
"ember-try": "^0.2.23",
4646
"ember-welcome-page": "^3.0.0",

tests/fixtures/app/npm/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
"ember-cli-shims": "^1.2.0",
3232
"ember-cli-sri": "^2.1.0",
3333
"ember-cli-uglify": "^2.0.0",
34-
"ember-data": "~3.0.0-beta.1",
34+
"ember-data": "~3.0.0",
3535
"ember-export-application-global": "^2.0.0",
3636
"ember-load-initializers": "^1.0.0",
3737
"ember-maybe-import-regenerator": "^0.1.6",
3838
"ember-resolver": "^4.0.0",
39-
"ember-source": "~3.0.0-beta.1",
39+
"ember-source": "~3.0.0",
4040
"eslint-plugin-ember": "^5.0.0",
4141
"loader.js": "^4.2.3"
4242
},

tests/fixtures/app/yarn/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@
3131
"ember-cli-shims": "^1.2.0",
3232
"ember-cli-sri": "^2.1.0",
3333
"ember-cli-uglify": "^2.0.0",
34-
"ember-data": "~3.0.0-beta.1",
34+
"ember-data": "~3.0.0",
3535
"ember-export-application-global": "^2.0.0",
3636
"ember-load-initializers": "^1.0.0",
3737
"ember-maybe-import-regenerator": "^0.1.6",
3838
"ember-resolver": "^4.0.0",
39-
"ember-source": "~3.0.0-beta.1",
39+
"ember-source": "~3.0.0",
4040
"ember-welcome-page": "^3.0.0",
4141
"eslint-plugin-ember": "^5.0.0",
4242
"loader.js": "^4.2.3"

0 commit comments

Comments
 (0)