Merge branch 'master' into develop

BryanDonovan · BryanDonovan · commit 6ec6aa3a7beb · 2016-01-26T12:32:34.000-08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cache-manager",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "description": "Cache module for Node.js",
   "main": "index.js",
   "scripts": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cache-manager",`
`3`		`- "version": "1.2.2",`
	`3`	`+ "version": "1.3.0",`
`4`	`4`	`"description": "Cache module for Node.js",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`