[Pkg-javascript-commits] [node-jade] 27/72: Merge pull request #19 from jstransformers/locals

[Jelmer Vernooij]

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

jelmer pushed a commit to annotated tag upstream/1.0.0
in repository node-jade.

commit 31b97d5f378e21869c297f7ee4074bfe8a046cae
Merge: c8b9e14 6e87fc7
Author: Forbes Lindesay <forbes at lindesay.co.uk>
Date:   Tue Apr 14 11:17:39 2015 +0100

    Merge pull request #19 from jstransformers/locals
    
    render: Prefer locals over options if both are present

 index.js             |  8 ++++----
 test/render-async.js | 17 +++++++++++++++++
 test/render.js       | 14 ++++++++++++++
 3 files changed, 35 insertions(+), 4 deletions(-)

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