Merge branch 'master' of github.com:ohler55/ox

ohler55 · Dec 19, 2019 · ce1fc1e · ce1fc1e
2 parents 7c96307 + dcaf950
commit ce1fc1e
Show file tree

Hide file tree

Showing 15 changed files with 346 additions and 193 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: rubygems/ox
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with a single custom sponsorship URL
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,15 @@
+os:
+  - linux
+  - osx
+
 language: ruby
 
 rvm:
   - 2.2.9
   - 2.3.8
   - 2.4.5
-  - 2.5.3
-  - 2.6.2
+  - 2.5.5
+  - 2.6.3
 
 install: gem install test-unit