diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-18 16:00:47 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-18 16:00:47 -0300 |
| commit | 1879c259b870938c42d5d52f63123bfa0b8c81c8 (patch) | |
| tree | fb11dc4b5ca6bb20092631afa02c9cb392ddb80c /railties/lib | |
| parent | 4f23760a07186ff9c0c5935c971d2978f9f57277 (diff) | |
| parent | 8b20c72dd80e2faf531f308d430a145a253aeac3 (diff) | |
| download | rails-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 'railties/lib')
| -rw-r--r-- | railties/lib/rails/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index 923cab4e2a..e4fd798d18 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -3,7 +3,7 @@ module Rails MAJOR = 4 MINOR = 1 TINY = 0 - PRE = "beta1" + PRE = "beta2" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end |