aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-10-19 14:01:40 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-10-19 14:01:40 +0000
commite3e5d60bcd639da34333514562f82f89fd0c00f0 (patch)
tree6c478855297e0c1381acc8cb1877394620621215 /actionmailer
parentb437eee41d38188f10f11e041b82d7def0a20629 (diff)
downloadrails-e3e5d60bcd639da34333514562f82f89fd0c00f0.tar.gz
rails-e3e5d60bcd639da34333514562f82f89fd0c00f0.tar.bz2
rails-e3e5d60bcd639da34333514562f82f89fd0c00f0.zip
Really ready for push
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2686 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG5
-rw-r--r--actionmailer/lib/action_mailer/version.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG
index 6f6f240ef8..16d7d3b318 100644
--- a/actionmailer/CHANGELOG
+++ b/actionmailer/CHANGELOG
@@ -1,3 +1,8 @@
+*1.1.1* (October 19th, 2005)
+
+* Upgraded to Action Pack 1.10.1
+
+
*1.1.0* (October 16th, 2005)
* Update and extend documentation (rdoc)
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 5b5d98161c..4dbc364e20 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -2,7 +2,7 @@ module ActionMailer
module Version #:nodoc:
MAJOR = 1
MINOR = 1
- TINY = 0
+ TINY = 1
STRING = [MAJOR, MINOR, TINY].join('.')
end