Merge branch 'dev' of github.com:olado/doT into dev

rkyoku · Nov 30, 2014 · b45de54 · b45de54
2 parents 0b5eb9d + c192514
commit b45de54
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -61,6 +61,11 @@ Details
 
 	./bin/dot-packer -s examples/views -d out/views
 
+## Example for express
+	Many people are using doT with express. I added an example of the best way of doing it examples/express:
+
+[doT with express](examples/express)
+
 ## Notes
     doU.js is here only so that legacy external tests do not break. Use doT.js.
     doT.js with doT.templateSettings.append=false provides the same performance as doU.js.

diff --git a/benchmarks/templating/doT.js b/benchmarks/templating/doT.js
@@ -6,7 +6,7 @@
 	"use strict";
 
 	var doT = {
-		version: '1.0.1',
+		version: '1.0.2',
 		templateSettings: {
 			evaluate:    /\{\{([\s\S]+?(\}?)+)\}\}/g,
 			interpolate: /\{\{=([\s\S]+?)\}\}/g,

diff --git a/doT.js b/doT.js
@@ -6,7 +6,7 @@
 	"use strict";
 
 	var doT = {
-		version: '1.0.1',
+		version: '1.0.2',
 		templateSettings: {
 			evaluate:    /\{\{([\s\S]+?(\}?)+)\}\}/g,
 			interpolate: /\{\{=([\s\S]+?)\}\}/g,

diff --git a/doT.min.js b/doT.min.js
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
     "simple",
     "templating"
   ],
-  "version": "1.0.1",
+  "version": "1.0.2",
   "main": "index",
   "bin": {
     "dottojs": "./bin/dot-packer"