Merge branch 'trunk' into gutenberg/move-undo-redo-buttons

# Conflicts: # Podfile.lock
jeff4a501 · Jul 11, 2023 · 9a084bb · 9a084bb
2 parents 007ed0e + bbdfcb6
commit 9a084bb
Show file tree

Hide file tree

Showing 80 changed files with 3,124 additions and 6,499 deletions.
diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/me/rest_v11_me_sites.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/me/rest_v11_me_sites.json
@@ -359,7 +359,7 @@
           "ID": 181977606,
           "description": "Site with everything enabled",
           "name": "Weekend Bakes",
-          "URL": "yourjetpack.blog",
+          "URL": "weekendbakesblog.wordpress.com",
           "user_can_manage": false,
           "capabilities": {
             "edit_pages": true,

diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/categories.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/categories.json
diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/post-formats.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/post-formats.json
diff --git a/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/post_0_diffs.json b/API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/posts/post_0_diffs.json