]> git.ipfire.org Git - thirdparty/shairport-sync.git/commitdiff
Merge branch 'development' of git.aillwee.com:base/shairport-sync into development
authorMike Brady <4265913+mikebrady@users.noreply.github.com>
Sun, 14 Nov 2021 15:13:54 +0000 (15:13 +0000)
committerMike Brady <4265913+mikebrady@users.noreply.github.com>
Sun, 14 Nov 2021 15:13:54 +0000 (15:13 +0000)
Merge independent changes.

1  2 
player.c

diff --cc player.c
Simple merge