Merge branch 'f-customer-vendor-rights'
authorMoritz Bunkus <m.bunkus@linet.de>
Mon, 4 Jan 2021 15:29:41 +0000 (16:29 +0100)
committerMoritz Bunkus <m.bunkus@linet.de>
Mon, 4 Jan 2021 15:29:41 +0000 (16:29 +0100)

Trivial merge