[Pkg-javascript-commits] [node-browser-pack] 15/27: Merge tag 'v6.0.4' into upstream

[Bastien Roucariès]

This is an automated email from the git hooks/post-receive script.

rouca pushed a commit to branch master
in repository node-browser-pack.

commit e78638c1f3ba5ea0eb880648d3ace95317ce4316
Merge: 3f4f699 119c89e
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Sun Feb 18 21:51:47 2018 +0100

    Merge tag 'v6.0.4' into upstream

 .travis.yml     |  4 ++++
 CHANGELOG.md    |  7 +++++++
 index.js        | 26 ++++++++++++++++----------
 package.json    | 12 +++++++-----
 prelude.js      | 10 ++++++++--
 readme.markdown |  4 +---
 6 files changed, 43 insertions(+), 20 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-browser-pack.git