From: Felix Ernst <fe.a.ernst@gmail.com>
Date: Fri, 13 Nov 2020 10:41:17 +0000 (+0100)
Subject: Merge branch 'release/20.12'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/d80d79024d04670e9d4bcea12575b08bf0bb76b8

Merge branch 'release/20.12'
---

d80d79024d04670e9d4bcea12575b08bf0bb76b8