diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-08-11 12:20:20 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-08-11 12:20:20 -0700 |
| commit | fecc67d5152576eb9d918f6a2b90851e8fd6a23c (patch) | |
| tree | 3053f3080d1a2aeeddc7b764b373e46a9e2ee9db /activerecord | |
| parent | 5efc4ec4d997cb5f491a7dd79dd94779d08cf80d (diff) | |
| parent | c4e01690620c319ac3f04d213003f8001f33d14b (diff) | |
| download | rails-fecc67d5152576eb9d918f6a2b90851e8fd6a23c.tar.gz rails-fecc67d5152576eb9d918f6a2b90851e8fd6a23c.tar.bz2 rails-fecc67d5152576eb9d918f6a2b90851e8fd6a23c.zip | |
Merge branch '3-2-22-3' into 3-2-stable
* 3-2-22-3:
bumping version
Include missing module in tag_helper
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 7cfe3fff79..c5740919d6 100644 --- a/activerecord/lib/active_record/version.rb +++ b/activerecord/lib/active_record/version.rb @@ -3,7 +3,7 @@ module ActiveRecord MAJOR = 3 MINOR = 2 TINY = 22 - PRE = "3" + PRE = "4" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |