From: Felix Ernst <fe.a.ernst@gmail.com>
Date: Mon, 23 Nov 2020 12:38:22 +0000 (+0100)
Subject: Merge branch 'release/20.12'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/b62095950a8f0ed6d7359fd9b5e381dfdd2ac4d1

Merge branch 'release/20.12'
---

b62095950a8f0ed6d7359fd9b5e381dfdd2ac4d1