[Pkg-javascript-commits] [node-chalk] 02/12: Merge tag 'upstream/1.1.3'

[Mathias Behrle]

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

mbehrle pushed a commit to branch master
in repository node-chalk.

commit 1d246ab1f3abdbe306b6b7372d8029cdd6675af8
Merge: a509086 e540a40
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Mon Jul 18 17:36:51 2016 +0200

    Merge tag 'upstream/1.1.3'
    
    Upstream version 1.1.3

 .editorconfig              |   2 +-
 .gitignore                 |   2 ++
 .jshintrc                  |  13 ----------
 .travis.yml                |   1 +
 benchmark.js               |   2 ++
 index.js                   |  46 ++++++++++++++++++++++-----------
 logo.png => media/logo.png | Bin
 logo.svg => media/logo.svg |   0
 package.json               |  39 ++++++++++++++++++++--------
 readme.md                  |  34 +++++++++++++++++-------
 test.js                    |  63 ++++++++++++++++++++++++++++++++++++++++++++-
 11 files changed, 152 insertions(+), 50 deletions(-)

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