Merge branch 'master' into clostridium

* master:
  Upgrade ember-cli-flash
This commit is contained in:
Matthew Dillon 2015-10-29 13:06:30 -07:00
commit 6509f63f00

View file

@ -25,7 +25,7 @@
"ember-cli-babel": "^5.1.3",
"ember-cli-dependency-checker": "^1.0.1",
"ember-cli-divshot": "^0.1.7",
"ember-cli-flash": "1.3.3",
"ember-cli-flash": "1.3.6",
"ember-cli-htmlbars": "0.7.9",
"ember-cli-htmlbars-inline-precompile": "^0.2.0",
"ember-cli-ic-ajax": "0.2.1",