Fwd: Last Minute Dolphin Merge

[Nate Graham]

Done. Release folks, can you please add the revert commit 
(63e12c0cdf4e3437b95b9c50e5791dbf97183687) to the tarball? Thanks!

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?

Nate


On 8/6/21 11:03 AM, Méven wrote:
> Go ahead.
> 
> Le ven. 6 août 2021 à 18:48, Nate Graham <nate at kde.org 
> <mailto:nate at kde.org>> a écrit :
> 
>     OK. Then we need to revert commit
>     996e430b62075c5b69571f141456dbe5f2956679 on the release branch. Any
>     objections, or shall I do it now?
> 
>     Nate
> 
> 
>     On 8/6/21 10:44 AM, Méven wrote:
>      > Correct. That's what I meant.
>      >
>      > Le ven. 6 août 2021 à 18:40, Nate Graham <nate at kde.org
>     <mailto:nate at kde.org>
>      > <mailto:nate at kde.org <mailto:nate at kde.org>>> a écrit :
>      >
>      >     You mean reverting the change to always sort hidden files
>     last in 21.08?
>      >
>      >     Nate
>      >
>      >
>      >     On 8/6/21 10:38 AM, Méven wrote:
>      >      > Reverting is the simplest way to go, we are simply too
>     late this
>      >     time
>      >      > around.
>      >      >
>      >      > This is a small feature anyway, 4 months delay is better
>     to get
>      >     it right.
>      >      >
>      >      > --
>      >      > Méven
>      >
>      >
>      >
>      > --
>      > Méven
>