Merge branch 'master' into feature/sink_vorbis
authorPaul Brossier <piem@piem.org>
Wed, 19 Dec 2018 20:49:26 +0000 (21:49 +0100)
committerPaul Brossier <piem@piem.org>
Wed, 19 Dec 2018 20:49:26 +0000 (21:49 +0100)
1  2 
.circleci/config.yml
.travis.yml

Simple merge
diff --cc .travis.yml
Simple merge