thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into clostridium

Browse source 
* master:
  ember 2.2.0 & ember-data 2.2.1
This commit is contained in:
Matthew Dillon 2015-11-25 21:48:26 -07:00
commit b3c646cb18
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bower.json
View file

@ -2,10 +2,10 @@
"name": "clostridiumdotinfo", "name": "clostridiumdotinfo",
"dependencies": { "dependencies": {
"jquery": "~2.1.1", "jquery": "~2.1.1",
"ember": "~2.1.0", "ember": "~2.2.0",
"ember-cli-shims": "0.0.6", "ember-cli-shims": "0.0.6",
"ember-cli-test-loader": "0.2.1", "ember-cli-test-loader": "0.2.1",
"ember-data": "~2.1.0", "ember-data": "~2.2.1",
"ember-load-initializers": "0.1.7", "ember-load-initializers": "0.1.7",
"ember-qunit": "0.4.16", "ember-qunit": "0.4.16",
"ember-qunit-notifications": "~0.1.0", "ember-qunit-notifications": "~0.1.0",

2
package.json
View file

@ -35,7 +35,7 @@
"ember-cli-release": "0.2.8", "ember-cli-release": "0.2.8",
"ember-cli-sri": "^1.1.0", "ember-cli-sri": "^1.1.0",
"ember-cli-uglify": "^1.2.0", "ember-cli-uglify": "^1.2.0",
"ember-data": "1.13.15", "ember-data": "~2.2.1",
"ember-disable-proxy-controllers": "^1.0.1", "ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^1.0.4", "ember-export-application-global": "^1.0.4",
"ember-one-way-input": "0.1.3", "ember-one-way-input": "0.1.3",