diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-10-30 11:37:33 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-10-30 11:37:33 -0700 |
| commit | 03366b14d15aeebf255a54b2878dcc6206c0c372 (patch) | |
| tree | b9bb34fdd8a46f057c1a5edd6aefd7f7609a0468 /activeresource/lib | |
| parent | 11fd052aa815ae0255ea5b2463e88138fb3fec61 (diff) | |
| parent | 346acea281f048c853a6318429daac8d1a2e2d68 (diff) | |
| download | rails-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 'activeresource/lib')
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index 5e8910f386..3da69b0bdc 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -2,7 +2,7 @@ module ActiveResource module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 19 + TINY = 20 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |