diff options
| author | Florian Frank <flori@ping.de> | 2011-06-20 14:21:23 +0200 |
|---|---|---|
| committer | Florian Frank <flori@ping.de> | 2011-06-20 14:21:23 +0200 |
| commit | 56dc110b757a21c2e5dd9b96505d631dbc606858 (patch) | |
| tree | 5878d27aa92382ad28040340869502339a5c3495 /lib/json/version.rb | |
| parent | 3822d9f3765020f8a2b2279f0c036a9fc9be9944 (diff) | |
| parent | b8f2b87f121a386853c6198e4984ed61d210715f (diff) | |
| download | ruby-json-56dc110b757a21c2e5dd9b96505d631dbc606858.tar.gz | |
Merge branch 'master' of gate.dyna.ping.de:/git/json
Conflicts: json.gemspec json_pure.gemspec
Diffstat (limited to 'lib/json/version.rb')
| -rw-r--r-- | lib/json/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/json/version.rb b/lib/json/version.rb index e246300..cd9456b 100644 --- a/lib/json/version.rb +++ b/lib/json/version.rb @@ -1,6 +1,6 @@ module JSON # JSON version - VERSION = '1.5.2' + VERSION = '1.5.3' VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc: VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc: VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: |