summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2016-02-25 16:50:30 +0100
committerFlorian Frank <flori@ping.de>2016-02-25 16:50:30 +0100
commit70827323bd22eaf1b3e41d6e1a44f5e439524042 (patch)
tree83b009c50a0b4024b7554d5129f2377ffb9390c0
parent80e8213ce940005a1c7314793d39a0c4cc786821 (diff)
parente99c5d534ab5d6832c292500889bef82c5510828 (diff)
downloadjson-70827323bd22eaf1b3e41d6e1a44f5e439524042.tar.gz
Merge branch 'v1.8'
-rw-r--r--.travis.yml3
-rw-r--r--Gemfile5
2 files changed, 0 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml
index 70db3f8..e1ebeda 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,6 @@ rvm:
- 1.9.3
- 2.0.0
- 2.1
- - 2.2.1
- - 2.2.2
- - 2.2.3
- 2.2
- 2.3.0
- ree
diff --git a/Gemfile b/Gemfile
index 4ce50ec..71fac47 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,8 +5,3 @@ source 'https://rubygems.org'
gemspec :name => 'json'
gemspec :name => 'json_pure'
gemspec :name => 'json-java'
-
-gem 'rake'
-gem 'rdoc'
-gem 'test-unit'
-gem 'byebug', :platform => :mri