Merge branch 'master' into feature/sink_vorbis
authorPaul Brossier <piem@piem.org>
Thu, 20 Dec 2018 22:30:52 +0000 (23:30 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 20 Dec 2018 22:30:52 +0000 (23:30 +0100)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge