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-cli 1.13.13
This commit is contained in:
Matthew Dillon 2015-11-28 11:35:23 -07:00
commit 4f4b5d8a4d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bower.json
View file

@ -8,9 +8,9 @@
"ember-data": "~2.2.1", "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",
"ember-resolver": "~0.1.20", "ember-resolver": "~0.1.20",
"loader.js": "ember-cli/loader.js#3.2.1", "loader.js": "ember-cli/loader.js#3.4.0",
"qunit": "~1.20.0", "qunit": "~1.20.0",
"flakes": "~1.0.0", "flakes": "~1.0.0",
"moment": "~2.10.6", "moment": "~2.10.6",

4
package.json
View file

@ -20,7 +20,7 @@
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"broccoli-asset-rev": "^2.2.0", "broccoli-asset-rev": "^2.2.0",
"ember-cli": "1.13.12", "ember-cli": "1.13.13",
"ember-cli-app-version": "^1.0.0", "ember-cli-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.5", "ember-cli-babel": "^5.1.5",
"ember-cli-content-security-policy": "0.4.0", "ember-cli-content-security-policy": "0.4.0",
@ -33,7 +33,7 @@
"ember-cli-mirage": "0.1.11", "ember-cli-mirage": "0.1.11",
"ember-cli-qunit": "^1.0.4", "ember-cli-qunit": "^1.0.4",
"ember-cli-release": "0.2.8", "ember-cli-release": "0.2.8",
"ember-cli-sri": "^1.1.0", "ember-cli-sri": "^1.2.0",
"ember-cli-uglify": "^1.2.0", "ember-cli-uglify": "^1.2.0",
"ember-data": "~2.2.1", "ember-data": "~2.2.1",
"ember-disable-proxy-controllers": "^1.0.1", "ember-disable-proxy-controllers": "^1.0.1",