aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/version.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-22 20:24:09 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-07-22 20:24:09 -0300
commit2b3ce8627b6b4a401a2e869b22e51cc88d52c49b (patch)
tree7205ec41e28059371d2a9c874ce0ceab7f57498d /activerecord/lib/active_record/version.rb
parentd8353073d1d00ace843eb5e402ebc7fdb2d7c342 (diff)
parentc69ccea6f291fd3dd18d20597abf268bcc1233cf (diff)
downloadrails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.tar.gz
rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.tar.bz2
rails-2b3ce8627b6b4a401a2e869b22e51cc88d52c49b.zip
Merge branch '3-2-14' into 3-2-stable
Diffstat (limited to 'activerecord/lib/active_record/version.rb')
-rw-r--r--activerecord/lib/active_record/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/version.rb b/activerecord/lib/active_record/version.rb
index 9069d9964f..9e3d1539c6 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 = 13
+ TINY = 14
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')