aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/option_merger_test.rb
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2015-01-01 00:08:17 +0100
committerRobin Dupret <robin.dupret@gmail.com>2015-01-01 00:08:17 +0100
commit24637e577c0c8139434bada14911f376ec2634e9 (patch)
treec22d2dbb41ee144c25699cc0fce26378f1b9564e /activesupport/test/option_merger_test.rb
parent777c45e6a5a2cb89e1e1e892a32b0dbdebbfe680 (diff)
parent4de18d0ead0581821f4940abb12cef790514c6a0 (diff)
downloadrails-24637e577c0c8139434bada14911f376ec2634e9.tar.gz
rails-24637e577c0c8139434bada14911f376ec2634e9.tar.bz2
rails-24637e577c0c8139434bada14911f376ec2634e9.zip
Merge pull request #18271 from arunagw/change-copyright-year
Update copyright notices to 2015 [ci skip]
Diffstat (limited to 'activesupport/test/option_merger_test.rb')
0 files changed, 0 insertions, 0 deletions