Merge branch 'master' into feature/sink_vorbis
authorPaul Brossier <piem@piem.org>
Fri, 21 Dec 2018 19:06:09 +0000 (20:06 +0100)
committerPaul Brossier <piem@piem.org>
Fri, 21 Dec 2018 19:06:09 +0000 (20:06 +0100)
commit131d1eb8fb3f2b127429947792e9eb0acd53c0b3
tree36eaac39683516e58311f958c8202a2484a3c7e6
parent4ed1e47d19c17aee4bf508771a0b7aa52afcb9cf
parenta280ed16952e8b3d829af2e11b855de4fb691905
Merge branch 'master' into feature/sink_vorbis
.travis.yml