Merge branch 'kellyselden-rollup'

# Conflicts: # CHANGELOG.md
rollup · Feb 19, 2018 · 902c848 · 902c848
2 parents 80d23f5 + 077f7ae
commit 902c848
Show file tree

Hide file tree

Showing 5 changed files with 710 additions and 634 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ## 3.0.4 (unreleased)
 
-* Update lockfile [#137](https://github.com/rollup/rollup-plugin-node-resolve/issues/137) and [#131](https://github.com/rollup/rollup-plugin-node-resolve/issues/131)
+* Update lockfile [#137](https://github.com/rollup/rollup-plugin-node-resolve/issues/137) and [#131](https://github.com/rollup/rollup-plugin-node-resolve/issues/137)
+* Update rollup dependency [#138](https://github.com/rollup/rollup-plugin-node-resolve/issues/137) and [#131](https://github.com/rollup/rollup-plugin-node-resolve/issues/138)
 
 ## 3.0.3