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)
commit171ae68d6221cf0cd48fcdd0ad70bc895b2d39d3
tree23690209e04c0682b3cd6cc1640c1eafd36f1f0b
parentb8fa393ea2f4a0df4325c0bd7789ef3e175b7c33
parent8e76c71be6136f4e2289f8c67e422097f5e10dfe
Merge branch 'master' into feature/sink_vorbis
.travis.yml