Merge commit '899ee03088d55152a48830df0899887f055da1de'
authorJames Almer <jamrial@gmail.com>
Thu, 14 Mar 2019 18:53:16 +0000 (15:53 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 14 Mar 2019 18:53:16 +0000 (15:53 -0300)
commitecb5546e97c479378e057f527cc1d79a46c31cb1
tree79f74c80a921a37db0cf4214578f5d50ed4bbfbe
parentac4b5d86222006fa71ffe5922e1a34f1422507d8
parent899ee03088d55152a48830df0899887f055da1de
Merge commit '899ee03088d55152a48830df0899887f055da1de'

* commit '899ee03088d55152a48830df0899887f055da1de':
  Unbreak travis on macos

Merged-by: James Almer <jamrial@gmail.com>
.travis.yml