Fwd: Last Minute Dolphin Merge

[Heiko Becker]

On Friday, 6 August 2021 19:12:19 CEST, Nate Graham wrote:
> Done. Release folks, can you please add the revert commit 
> (63e12c0cdf4e3437b95b9c50e5791dbf97183687) to the tarball? 
> Thanks!

Done. New tarball up

63e12c0cdf4e3437b95b9c50e5791dbf97183687
SHA256: 5666dce41371192a897a696d82acb0c8628cb8147372c33fc2b4065c572867a1 
dolphin-21.08.0.tar.xz

> And now a git question. How can we avoid picking up these 
> revert commits on master the next time anyone does a merge from 
> stable to master?

I'd say merge to master and revert the reverted commits.

Regards,
Heiko