Merge remote-tracking branch 'origin/2.7' into master

4 files changed, 18 insertions, 0 deletions

diff --git a/changelog/unreleased/8244 b/changelog/2.7.2_2020-12-02/8244
index f403b0a7c..f403b0a7c 100644
--- a/changelog/unreleased/8244
+++ b/changelog/2.7.2_2020-12-02/8244
diff --git a/changelog/2.7.2_2020-12-02/8248 b/changelog/2.7.2_2020-12-02/8248
new file mode 100644
index 000000000..dec7ebd57
--- /dev/null
+++ b/changelog/2.7.2_2020-12-02/8248
@@ -0,0 +1,6 @@
+Bugfix: Sync small plaintext files with Windows VFS
+
+We fixed a bug where small plaintext files where not synced 
+due to a broken interity check.
+
+https://github.com/owncloud/client/issues/8248
diff --git a/changelog/2.7.2_2020-12-02/8258 b/changelog/2.7.2_2020-12-02/8258
new file mode 100644
index 000000000..fc938eb30
--- /dev/null
+++ b/changelog/2.7.2_2020-12-02/8258
@@ -0,0 +1,6 @@
+Bugfix: Update "Sync hidden files" button
+
+We fixed a bug that prevented the "Sync hidden files" from 
+displaying the correct value.
+
+https://github.com/owncloud/client/issues/8258
diff --git a/changelog/2.7.2_2020-12-02/8263 b/changelog/2.7.2_2020-12-02/8263
new file mode 100644
index 000000000..b7606740e
--- /dev/null
+++ b/changelog/2.7.2_2020-12-02/8263
@@ -0,0 +1,6 @@
+Bugfix: Pause sync when displaying remove all dialog
+
+We now pause the syn process when the all files where removed dialog is
+displayed. This prevents multiple dialogs from being displayed.
+
+https://github.com/owncloud/client/issues/8263