diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-08-11 10:40:42 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-08-11 10:40:42 -0700 |
| commit | 5efc4ec4d997cb5f491a7dd79dd94779d08cf80d (patch) | |
| tree | c102edcfc9b5f8f85bac64520234a804643066c3 /activeresource | |
| parent | d4a1b33a2ab6703124926fbf805d77ef753e1b87 (diff) | |
| parent | ebc3639139d21eeb8452edb28ce62530cc075198 (diff) | |
| download | rails-5efc4ec4d997cb5f491a7dd79dd94779d08cf80d.tar.gz rails-5efc4ec4d997cb5f491a7dd79dd94779d08cf80d.tar.bz2 rails-5efc4ec4d997cb5f491a7dd79dd94779d08cf80d.zip | |
Merge branch '3-2-22-3' into 3-2-stable
* 3-2-22-3:
bumping version
ensure tag/content_tag escapes " in attribute vals
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/lib/active_resource/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activeresource/lib/active_resource/version.rb b/activeresource/lib/active_resource/version.rb index b12992013e..e8b791bb60 100644 --- a/activeresource/lib/active_resource/version.rb +++ b/activeresource/lib/active_resource/version.rb @@ -3,7 +3,7 @@ module ActiveResource MAJOR = 3 MINOR = 2 TINY = 22 - PRE = "2" + PRE = "3" STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |