Merge branch 'master' into clostridium

* master:
  ember 2 series
  Remove globals initializer
This commit is contained in:
Matthew Dillon 2015-11-17 08:13:07 -07:00
commit 4aaa9cdfb9
8 changed files with 30 additions and 49 deletions

View file

@ -4,6 +4,7 @@ const { Component, computed, inject: { service } } = Ember;
export default Component.extend({
session: service(),
globals: service(),
strains: null,
characteristics: null,