aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-12-31 12:48:19 -0800
committerVijay Dev <vijaydev.cse@gmail.com>2011-12-31 12:48:19 -0800
commitf3e079e8b54da1c4d0511495ced3f68c1b7a46f1 (patch)
treea588948160e0a8d2455e424f316e015d823dd566 /actionmailer
parentb5927b82376ba0982b29d634bd8d4834fcbf740b (diff)
parent1b413510fe5fc85a4f6e2c0e560c3d151a7e6ed1 (diff)
downloadrails-f3e079e8b54da1c4d0511495ced3f68c1b7a46f1.tar.gz
rails-f3e079e8b54da1c4d0511495ced3f68c1b7a46f1.tar.bz2
rails-f3e079e8b54da1c4d0511495ced3f68c1b7a46f1.zip
Merge pull request #4248 from andrew/2012
Updated copyright notices for 2012
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/MIT-LICENSE2
-rw-r--r--actionmailer/lib/action_mailer.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/MIT-LICENSE b/actionmailer/MIT-LICENSE
index 7ad1051066..810daf856c 100644
--- a/actionmailer/MIT-LICENSE
+++ b/actionmailer/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2011 David Heinemeier Hansson
+Copyright (c) 2004-2012 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/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 2ac4f3f681..1045dd58ef 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -1,5 +1,5 @@
#--
-# Copyright (c) 2004-2011 David Heinemeier Hansson
+# Copyright (c) 2004-2012 David Heinemeier Hansson
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the