[Pkg-javascript-commits] [node-coveralls] 295/332: Merge branch 'master' of github.com:nickmerwin/node-coveralls

[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-coveralls.

commit 4bc93ac340e0e9527b16a093bb8546a4246a721b
Merge: 671acca f390392
Author: Nick Merwin <n at mer.io>
Date:   Sun Feb 5 12:36:41 2017 -0800

    Merge branch 'master' of github.com:nickmerwin/node-coveralls

 .travis.yml                    |  6 +++---
 lib/getOptions.js              |  8 ++++++--
 package.json                   |  8 ++++----
 test/convertLcovToCoveralls.js | 10 +++++-----
 test/getOptions.js             | 17 ++++++++++-------
 5 files changed, 28 insertions(+), 21 deletions(-)

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