Merge fix from branch 'stable-1.10'
commitcc6e2dc01fe45c00dc77d628a76d0041a3ac05d5
authorRoland Lutz <rlutz@hedmen.org>
Fri, 28 May 2021 17:34:30 +0000 (28 19:34 +0200)
committerRoland Lutz <rlutz@hedmen.org>
Fri, 28 May 2021 17:34:30 +0000 (28 19:34 +0200)
treef30eee9c20bbbe6c4dc223d877fcdf1f2f3ae0b2
parent3403de1b45da1fc45507b1992807fb32dd46371d
parent271c8a56f1135f1b07dde6d4ff70ff12d2e60cdb
Merge fix from branch 'stable-1.10'