diff options
author | Lauro Caetano <laurocaetano1@gmail.com> | 2014-01-01 10:47:24 -0800 |
---|---|---|
committer | Lauro Caetano <laurocaetano1@gmail.com> | 2014-01-01 10:47:24 -0800 |
commit | e97d48f17e2ac5a0530c096543253886e057f624 (patch) | |
tree | 68584fec66de0749a912cb7c05376f6dd7b85566 /actionpack/lib | |
parent | da0463cf5e93905978e5f9f8b64e75fc33a9c7af (diff) | |
parent | 98cb3e69afd687f7c0d4bc48eabf284da691abcc (diff) | |
download | rails-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 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_dispatch.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_pack.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb index 24a3d4741e..920e651b08 100644 --- a/actionpack/lib/action_dispatch.rb +++ b/actionpack/lib/action_dispatch.rb @@ -1,5 +1,5 @@ #-- -# Copyright (c) 2004-2013 David Heinemeier Hansson +# Copyright (c) 2004-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/actionpack/lib/action_pack.rb b/actionpack/lib/action_pack.rb index ad5acd8080..77f656d6f1 100644 --- a/actionpack/lib/action_pack.rb +++ b/actionpack/lib/action_pack.rb @@ -1,5 +1,5 @@ #-- -# Copyright (c) 2004-2013 David Heinemeier Hansson +# Copyright (c) 2004-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 |