Sync 2.6.0 and 2.6.1 changelog back to main (#7608)

* Sync changelog * Update changelog
woocommerce · Sep 2, 2021 · 877b91d · 877b91d
1 parent 78f1bea
commit 877b91d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+== 2.6.1 09/01/2021 ==
+
+- Update: Update marketing task completion logic. #7586
+
 == 2.6.0 08/31/2021 == 
 
 - Fix: Fixes action button mis-alignment within card footer. #7412
@@ -11,6 +15,9 @@
 - Fix: Fix blank screen on analytics screens when searching #7482
 - Fix: Fix all links with hash to behind query parameters #7483
 - Fix: Fix Stats module CSS issue introduced by Gutenberg #7488
+- Fix: Fix marketing task visibility #7580
+- Fix: Fix stats-overview card padding issue #7594
+- Fix: Fix layout issue on marketing task #7598
 - Add: Add boolean isReverseTrend prop to SummaryNumber to show "positive" delta for negative numbers. #7357
 - Add: Adding links to help panel for marketing task #7384
 - Add: Add installed marketing extensions card to extensions task #7419

diff --git a/changelogs/fixed_marketing_task_visibility_7580 b/changelogs/fixed_marketing_task_visibility_7580
diff --git a/changelogs/update-7567_marketing_task_completion_logic b/changelogs/update-7567_marketing_task_completion_logic