Skip to content

Commit

Permalink
0.6.5
Browse files Browse the repository at this point in the history
  • Loading branch information
bartve committed Aug 27, 2015
1 parent 5bcdfd5 commit d4159e1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit d4159e1

Please sign in to comment.