Skip to content

Commit db00ce6

Browse files
adrientheboadrienthebo
committed
Merge branch '2.x' into 3.x
This ignores the 2.x .travis.yml when merging up since that version is only applicable to the 2.x branch. Conflicts: .travis.yml
2 parents 87c0f0c + af7bed2 commit db00ce6

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)