Merge pull request #1 from kputnam/master

Merge latest mainline master
kputnam · Jul 25, 2016 · 25d25b7 · 25d25b7
2 parents 79f229b + 2c90edc
commit 25d25b7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,5 +2,5 @@ language: ruby
 
 rvm:
 - 1.9.3
-- 1.9.2
-- 1.8.7
+- 2.2.4
+- 2.3.1
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -22,7 +22,7 @@ GEM
     minitest (5.8.3)
     multi_json (1.3.6)
     pg (0.18.4)
-    polyglot (0.3.3)
+    polyglot (0.3.5)
     power_assert (0.2.6)
     rake (11.1.2)
     rspec (2.8.0)
@@ -40,7 +40,7 @@ GEM
     test-unit (3.1.5)
       power_assert
     thread_safe (0.3.5)
-    treetop (1.4.10)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (1.2.2)
@@ -56,7 +56,4 @@ DEPENDENCIES
   rspec (~> 2.8.0)
   simplecov (~> 0.6.1)
   test-unit
-  treetop (~> 1.4)
-
-BUNDLED WITH
-   1.12.1
+  treetop (~> 1.4.14)