Comparing version 0.2.14 to 0.2.15
@@ -41,3 +41,3 @@ // Generated by CoffeeScript 1.4.0 | ||
} | ||
req.query = _.extend({}, req.query, options.data); | ||
req.query = _.extend({}, req.query, options.data, model.query); | ||
res = { | ||
@@ -44,0 +44,0 @@ send: function(status, json) { |
@@ -1888,3 +1888,3 @@ /* | ||
} | ||
req.query = _.extend({}, req.query, options.data); | ||
req.query = _.extend({}, req.query, options.data, model.query); | ||
res = { | ||
@@ -1891,0 +1891,0 @@ send: function(status, json) { |
{ "name": "highbrow" | ||
, "version": "0.2.14" | ||
, "version": "0.2.15" | ||
, "description": "A Backbone Base Framework" | ||
@@ -4,0 +4,0 @@ , "main": "lib/highbrow.js" |
Sorry, the diff of this file is not supported yet
323889