Code

Cherry pick changes from develop#3309

Code

Merged

aronasorman merged 4 commits intolearningequality:central-developlearningequality/ka-lite:central-developfrom MCGallaspy:central-developMCGallaspy/ka-lite:central-developCopy head branch name to clipboardMar 17, 2015

+29-10

Commits

Commits on Mar 16, 2015

• Cherry pick changes from develop

  MCGallaspy

  committed
  e1d6c23

• Fix js linting issue

  MCGallaspy

  committed
  63824f6

Commits on Mar 17, 2015

• Really fix device metadata issue (cherry pick from develop)

  MCGallaspy

  committed
  f13286c

• Merge remote-tracking branch 'mcgallaspy/central-develop' into central-develop

  MCGallaspy

  committed
  c29c18d