[Pkg-javascript-commits] [node-ejs] 02/03: Merge tag 'upstream/2.5.2'

[Thorsten Alteholz]

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

alteholz pushed a commit to branch master
in repository node-ejs.

commit bea924e198c0a50310dd431a54f9a783aa1fb2c6
Merge: bd77051 19fc9de
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Fri Nov 4 22:56:04 2016 +0100

    Merge tag 'upstream/2.5.2'
    
    Upstream version 2.5.2

 .eslintrc.json                                     |  31 +++
 .travis.yml                                        |   4 +-
 CHANGELOG.md                                       |  21 +-
 Jakefile                                           |   4 +-
 README.md                                          |  38 +--
 docs/jsdoc/options.jsdoc                           |   6 +-
 docs/syntax.md                                     |  22 +-
 lib/ejs.js                                         | 306 ++++++++++++---------
 package.json                                       |  16 +-
 sample/body.html                                   |   2 -
 sample/header.html                                 |   3 -
 sample/index.html                                  |  20 --
 sample/index.js                                    |  11 -
 test/ejs.js                                        |  30 ++
 test/fixtures/include-root.ejs                     |   1 +
 test/fixtures/include_preprocessor_line_slurp.ejs  |   1 +
 test/fixtures/include_preprocessor_line_slurp.html |   5 +
 .../include_preprocessor_line_slurp_child.ejs      |   5 +
 test/fixtures/strict.ejs                           |   5 +
 19 files changed, 318 insertions(+), 213 deletions(-)

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