aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-02 14:18:47 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-07-02 14:18:47 -0300
commitc43f20a4048ff2b245f8f163c2f9642f56c697a0 (patch)
tree5814f108b5fa98c1412e0dad6125d4b0d1e82910 /railties
parent3622858ed514493f730649d87428e12de1501ed8 (diff)
parent53c845cb185036c71cc9793c4eb6bf4dc989307b (diff)
downloadrails-c43f20a4048ff2b245f8f163c2f9642f56c697a0.tar.gz
rails-c43f20a4048ff2b245f8f163c2f9642f56c697a0.tar.bz2
rails-c43f20a4048ff2b245f8f163c2f9642f56c697a0.zip
Merge branch '3-2-sec' into 3-2-stable
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md5
-rw-r--r--railties/lib/rails/version.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index ce832d12ee..0ff661cc9f 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 3.2.19 (Jul 2, 2014) ##
+
+* No changes.
+
+
## Rails 3.2.18 (May 6, 2014) ##
* No changes.
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb
index ec2f5467f0..ef640c9dab 100644
--- a/railties/lib/rails/version.rb
+++ b/railties/lib/rails/version.rb
@@ -2,7 +2,7 @@ module Rails
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 18
+ TINY = 19
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')