aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/rails
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-03-27 16:15:21 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-03-27 16:15:21 -0700
commit460d2c7c28928ab0d880675c3a7a74e81605e835 (patch)
tree2083c7e91e7e34ad28441b255744262418ba37e3 /activerecord/lib/rails
parentd82e4c80a820280c8bb9957bd86453d8fea49384 (diff)
parent6968bc16a1a609c56cf056cd9cd8f8de251defde (diff)
downloadrails-460d2c7c28928ab0d880675c3a7a74e81605e835.tar.gz
rails-460d2c7c28928ab0d880675c3a7a74e81605e835.tar.bz2
rails-460d2c7c28928ab0d880675c3a7a74e81605e835.zip
Merge pull request #5622 from rafaelfranca/fix-2492-3-2
[3-2-stable] Fix label_tag to merge the options hash with the object hash
Diffstat (limited to 'activerecord/lib/rails')
0 files changed, 0 insertions, 0 deletions