diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-18 15:57:32 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-18 15:57:32 -0300 |
| commit | a3bda38467377cb8c3cdd52b6fcf6c6c31f74b82 (patch) | |
| tree | 44a3f5ac94d5ea4ea5219b669d91e0e17a674d74 /activerecord | |
| parent | 5a84d3eb81d8d5c24233b29276aa0a0d9f7f9cb9 (diff) | |
| parent | 666e9f65bdfeb6cc5aa80b6254608adc3d7845ce (diff) | |
| download | rails-a3bda38467377cb8c3cdd52b6fcf6c6c31f74b82.tar.gz rails-a3bda38467377cb8c3cdd52b6fcf6c6c31f74b82.tar.bz2 rails-a3bda38467377cb8c3cdd52b6fcf6c6c31f74b82.zip | |
Merge branch '3-2-17' into 3-2-stable
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb index 1210df34f6..cced9eae8f 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -2,7 +2,7 @@ module ActiveRecord module VERSION #:nodoc: MAJOR = 3 MINOR = 2 - TINY = 16 + TINY = 17 PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') |