aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorLauro Caetano <laurocaetano1@gmail.com>2014-01-01 10:47:24 -0800
committerLauro Caetano <laurocaetano1@gmail.com>2014-01-01 10:47:24 -0800
commite97d48f17e2ac5a0530c096543253886e057f624 (patch)
tree68584fec66de0749a912cb7c05376f6dd7b85566 /activesupport
parentda0463cf5e93905978e5f9f8b64e75fc33a9c7af (diff)
parent98cb3e69afd687f7c0d4bc48eabf284da691abcc (diff)
downloadrails-e97d48f17e2ac5a0530c096543253886e057f624.tar.gz
rails-e97d48f17e2ac5a0530c096543253886e057f624.tar.bz2
rails-e97d48f17e2ac5a0530c096543253886e057f624.zip
Merge pull request #13563 from vipulnsward/2014-is-here
2014 is here.
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 6aeeb7132d..d06d4f3b2d 100644
--- a/activesupport/MIT-LICENSE
+++ b/activesupport/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2013 David Heinemeier Hansson
+Copyright (c) 2005-2014 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 a40c6b559c..ab0054b339 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -1,5 +1,5 @@
#--
-# Copyright (c) 2005-2013 David Heinemeier Hansson
+# Copyright (c) 2005-2014 David Heinemeier Hansson
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the