summaryrefslogtreecommitdiff
path: root/ext/json/lib
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-16 03:04:46 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-06-16 03:04:46 +0000
commitb304078ae6b3b669c49579117aba85d72901e972 (patch)
tree8223ba29cbf417210e2686b72edd9045d6324b4e /ext/json/lib
parentbc917f98c0b4790dce2d8ccf8c34d6a1e9566bef (diff)
downloadruby-b304078ae6b3b669c49579117aba85d72901e972.tar.gz
Merge json-2.1.0 from https://github.com/flori/json
https://github.com/flori/json/blob/master/CHANGES.md#2017-04-18-210 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/json/lib')
-rw-r--r--ext/json/lib/json/version.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/json/lib/json/version.rb b/ext/json/lib/json/version.rb
index b88dfb6a08..b65ed87f98 100644
--- a/ext/json/lib/json/version.rb
+++ b/ext/json/lib/json/version.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: false
module JSON
# JSON version
- VERSION = '2.0.4'
+ VERSION = '2.1.0'
VERSION_ARRAY = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
VERSION_MAJOR = VERSION_ARRAY[0] # :nodoc:
VERSION_MINOR = VERSION_ARRAY[1] # :nodoc: