aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
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
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')
-rw-r--r--activesupport/MIT-LICENSE2
-rw-r--r--activesupport/lib/active_support.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/MIT-LICENSE b/activesupport/MIT-LICENSE
index d06d4f3b2d..7bffebb076 100644
--- a/activesupport/MIT-LICENSE
+++ b/activesupport/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2014 David Heinemeier Hansson
+Copyright (c) 2005-2015 David Heinemeier Hansson
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 34040e9d33..2c327244cc 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -1,5 +1,5 @@
#--
-# Copyright (c) 2005-2014 David Heinemeier Hansson
+# Copyright (c) 2005-2015 David Heinemeier Hansson
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the