templates
Advanced tools
Comparing version 1.2.3 to 1.2.4
@@ -71,3 +71,3 @@ 'use strict'; | ||
} | ||
return utils.merge({}, this.cache.data, view.context(locals)); | ||
return view.context(this.cache.data, locals); | ||
}); | ||
@@ -74,0 +74,0 @@ |
{ | ||
"name": "templates", | ||
"description": "System for creating and managing template collections, and rendering templates with any node.js template engine. Can be used as the basis for creating a static site generator or blog framework.", | ||
"version": "1.2.3", | ||
"version": "1.2.4", | ||
"homepage": "https://github.com/jonschlinkert/templates", | ||
@@ -6,0 +6,0 @@ "author": "Jon Schlinkert (https://github.com/jonschlinkert)", |
@@ -2300,3 +2300,3 @@ # templates [![NPM version](https://img.shields.io/npm/v/templates.svg?style=flat)](https://www.npmjs.com/package/templates) [![NPM monthly downloads](https://img.shields.io/npm/dm/templates.svg?style=flat)](https://npmjs.org/package/templates) [![NPM total downloads](https://img.shields.io/npm/dt/templates.svg?style=flat)](https://npmjs.org/package/templates) [![Linux Build Status](https://img.shields.io/travis/jonschlinkert/templates.svg?style=flat&label=Travis)](https://travis-ci.org/jonschlinkert/templates) | ||
| --- | --- | | ||
| 736 | [jonschlinkert](https://github.com/jonschlinkert) | | ||
| 739 | [jonschlinkert](https://github.com/jonschlinkert) | | ||
| 105 | [doowb](https://github.com/doowb) | | ||
@@ -2337,2 +2337,2 @@ | 1 | [chronzerg](https://github.com/chronzerg) | | ||
_This file was generated by [verb-generate-readme](https://github.com/verbose/verb-generate-readme), v0.4.2, on February 09, 2017._ | ||
_This file was generated by [verb-generate-readme](https://github.com/verbose/verb-generate-readme), v0.4.2, on February 10, 2017._ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
176274