aboutsummaryrefslogtreecommitdiffstats
path: root/RAILS_VERSION
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-10-30 11:37:33 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-10-30 11:37:33 -0700
commit03366b14d15aeebf255a54b2878dcc6206c0c372 (patch)
treeb9bb34fdd8a46f057c1a5edd6aefd7f7609a0468 /RAILS_VERSION
parent11fd052aa815ae0255ea5b2463e88138fb3fec61 (diff)
parent346acea281f048c853a6318429daac8d1a2e2d68 (diff)
downloadrails-03366b14d15aeebf255a54b2878dcc6206c0c372.tar.gz
rails-03366b14d15aeebf255a54b2878dcc6206c0c372.tar.bz2
rails-03366b14d15aeebf255a54b2878dcc6206c0c372.zip
Merge branch '3.2.20' into 3-2-stable
* 3.2.20: bumping version to 3.2.20 FileHandler should not be called for files outside the root
Diffstat (limited to 'RAILS_VERSION')
-rw-r--r--RAILS_VERSION2
1 files changed, 1 insertions, 1 deletions
diff --git a/RAILS_VERSION b/RAILS_VERSION
index 100838dc41..476df44f32 100644
--- a/RAILS_VERSION
+++ b/RAILS_VERSION
@@ -1 +1 @@
-3.2.19
+3.2.20