aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-02-18 16:00:47 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-02-18 16:00:47 -0300
commit1879c259b870938c42d5d52f63123bfa0b8c81c8 (patch)
treefb11dc4b5ca6bb20092631afa02c9cb392ddb80c /activesupport/lib
parent4f23760a07186ff9c0c5935c971d2978f9f57277 (diff)
parent8b20c72dd80e2faf531f308d430a145a253aeac3 (diff)
downloadrails-1879c259b870938c42d5d52f63123bfa0b8c81c8.tar.gz
rails-1879c259b870938c42d5d52f63123bfa0b8c81c8.tar.bz2
rails-1879c259b870938c42d5d52f63123bfa0b8c81c8.zip
Merge branch '4-1-0-beta2'
Conflicts: actionview/CHANGELOG.md activerecord/CHANGELOG.md
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/version.rb b/activesupport/lib/active_support/version.rb
index b3f0e7198d..b9d6417b07 100644
--- a/activesupport/lib/active_support/version.rb
+++ b/activesupport/lib/active_support/version.rb
@@ -1,7 +1,7 @@
module ActiveSupport
# Returns the version of the currently loaded ActiveSupport as a Gem::Version
def self.version
- Gem::Version.new "4.1.0.beta1"
+ Gem::Version.new "4.1.0.beta2"
end
module VERSION #:nodoc: