aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-11 20:48:21 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-11 20:48:21 -0700
commit5919a552e4e4203b8d5eb5234428bc00dd462c49 (patch)
tree42c34f507693ff5e154272f830509a00b89a4462 /activeresource
parent5c6cf4e59e3e9c75395541162f2741b82347af0a (diff)
parentc09829e03db611b46bb52e2054991222cf57bfbe (diff)
downloadrails-5919a552e4e4203b8d5eb5234428bc00dd462c49.tar.gz
rails-5919a552e4e4203b8d5eb5234428bc00dd462c49.tar.bz2
rails-5919a552e4e4203b8d5eb5234428bc00dd462c49.zip
Merge pull request #10303 from ahorner/3-2-stable
Preserve context for joins while merging relations
Diffstat (limited to 'activeresource')
0 files changed, 0 insertions, 0 deletions