Skip to content

[stable20] fix loading mtime of new file in conflict dialog in firefox#24491

Merged
GretaD merged 1 commit intostable20from
backport/24376/stable20
Dec 2, 2020
Merged

[stable20] fix loading mtime of new file in conflict dialog in firefox#24491
GretaD merged 1 commit intostable20from
backport/24376/stable20

Conversation

@backportbot-nextcloud
Copy link

@backportbot-nextcloud backportbot-nextcloud bot commented Dec 2, 2020

backport of #24376

@MorrisJobke
Copy link
Member

/compile amend /

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
@npmbuildbot-nextcloud npmbuildbot-nextcloud bot force-pushed the backport/24376/stable20 branch from 123fdac to 1f6e5c6 Compare December 2, 2020 07:37
@MorrisJobke MorrisJobke added the 3. to review Waiting for reviews label Dec 2, 2020
@GretaD GretaD merged commit 02427cd into stable20 Dec 2, 2020
@GretaD GretaD deleted the backport/24376/stable20 branch December 2, 2020 15:45
This was referenced Dec 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review Waiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants