Merge pull request #3361 from simplabs/update-ember

Updated Ember to 1.6.1
This commit is contained in:
Hannah Wolfe 2014-07-22 16:49:53 +01:00
commit 7a30827af4

View File

@ -4,7 +4,7 @@
"codemirror": "4.0.1", "codemirror": "4.0.1",
"Countable": "2.0.2", "Countable": "2.0.2",
"device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d", "device": "git://github.com/matthewhudson/device.js#5347a275b66020a0d4dfe9aad81a488f8cce448d",
"ember": "1.5.0", "ember": "1.6.1",
"ember-data": "~1.0.0-beta.8", "ember-data": "~1.0.0-beta.8",
"ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1", "ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1",
"ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e", "ember-resolver": "git://github.com/stefanpenner/ember-jj-abrams-resolver.git#181251821cf513bb58d3e192faa13245a816f75e",