0.6.5

bartve · bartve · commit d4159e1ea45b · 2015-08-27T08:52:17.000+02:00
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,7 @@
+0.6.5 / 2015-08-27
+==================
+  * Fixed a bug in `util.merge()`
+
 0.6.4 / 2015-07-09
 ==================
   * Prevent `JSON.parse()` crash when the Discogs API returns HTML instead of json (maintainance mode)
diff --git a/lib/util.js b/lib/util.js
@@ -51,7 +51,7 @@ util.escape = function(str){
  * @returns {object}
  */
 
-util.merge = function(target, source){
+util.merge = function merge(target, source){
 	for(var key in source){
 		if(source[key] && (typeof source[key] === 'object')){
 			target[key] = merge((Array.isArray(source[key]) ? [] : {}), source[key]);
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "disconnect",
   "description": "A full featured Discogs API v2.0 client library",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "keywords": ["discogs", "api", "client", "oauth"],
   "homepage": "https://github.com/bartve/disconnect",
   "bugs": "https://github.com/bartve/disconnect/issues",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "disconnect",`
`3`	`3`	`"description": "A full featured Discogs API v2.0 client library",`
`4`		`- "version": "0.6.4",`
	`4`	`+ "version": "0.6.5",`
`5`	`5`	`"keywords": ["discogs", "api", "client", "oauth"],`
`6`	`6`	`"homepage": "https://github.com/bartve/disconnect",`
`7`	`7`	`"bugs": "https://github.com/bartve/disconnect/issues",`