Merge branch 'master' into 5.x
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
rvm:
|
||||
<<<<<<< HEAD
|
||||
- 2.4.0
|
||||
- 2.6.0
|
||||
- jruby-9.2.7.0
|
||||
|
||||
Reference in New Issue
Block a user