Merge in the es6 branch then update dependencies

2017-01-26 15:34:27 +00:00 · 2017-01-26 15:34:27 +00:00 · b4671f322b
commit b4671f322b
parent 0b7bf7a378
2 changed files with 237 additions and 221 deletions
--- a/changelog.md
+++ b/changelog.md
@ -2,6 +2,7 @@

 ## Version {next}
  - Improve syndication flow when working out which targets to use
+  - Use webpack/babel/es6 (this was a big one, code wise, functionality now basically the same though)

 ## Version 0.1.1 (2016-12-10)
  - Fix: use correct link for footer iwc icon
--- a/composer.lock
+++ b/composer.lock