Merge branch 'master' into clostridium

* master:
  ESA 1.0.1
This commit is contained in:
Matthew Dillon 2015-11-16 18:29:15 -07:00
commit 0815e4c4c9

View file

@ -39,6 +39,6 @@
"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",
"ember-simple-auth": "1.0.0" "ember-simple-auth": "1.0.1"
} }
} }