Code

Sync master with develop#129

Code

Merged

homu merged 6 commits intomasteradopted-ember-addons/ember-cli-flash:masterfrom developadopted-ember-addons/ember-cli-flash:developCopy head branch name to clipboardFeb 15, 2016

+144-50

Commits

Commits on Nov 15, 2015

• Merge branch 'release/1.3.8' into develop

  poteto

  committed
  2de73e4

Commits on Nov 25, 2015

• Add active class in run.next instead of afterRender queue

  Show description for c0127b1
  kmiyashiro

  committed
  c0127b1

• Remove trailing comma to appease jscs

  kmiyashiro

  committed
  4deddc7

• Merge pull request #121 from kmiyashiro/tick-active-class

  Show description for 7372d32
  poteto

  committed
  7372d32

Commits on Feb 15, 2016

• Update ember-cli

  poteto

  committed
  f99c3b8

• Auto merge of #130 - poteto:update-ember-cli, r=poteto

  Show description for dc70509
  homu

  committed
  dc70509