Merge branch 'master' into 5.x

This commit is contained in:
Dawa Ometto
2020-03-29 21:57:31 +02:00
8 changed files with 41 additions and 3 deletions
+1
View File
@@ -1,4 +1,5 @@
rvm:
<<<<<<< HEAD
- 2.4.0
- 2.6.0
- jruby-9.2.7.0