This repository was archived by the owner on Nov 19, 2024. It is now read-only.
Commit 5836415
authored
Sync 2.4.2-develop (#8169)
Manually resolved conflicts:
CONFLICT (content): Merge conflict in src/marketplace/sellers/extension-create.md
CONFLICT (add/add): Merge conflict in src/guides/v2.4/release-notes/open-source-2-4-1.md
CONFLICT (add/add): Merge conflict in src/guides/v2.4/release-notes/commerce-2-4-1.md
CONFLICT (content): Merge conflict in src/guides/v2.4/release-notes/b2b-release-notes.md
CONFLICT (add/add): Merge conflict in src/guides/v2.4/graphql/queries/available-stores.md
CONFLICT (add/add): Merge conflict in src/guides/v2.3/release-notes/open-source-2-3-6.md
CONFLICT (add/add): Merge conflict in src/guides/v2.3/release-notes/commerce-2-3-6.md
CONFLICT (content): Merge conflict in src/cloud/project/magento-app-php-ini.md
CONFLICT (add/add): Merge conflict in src/_includes/graphql/store-config.md
CONFLICT (content): Merge conflict in src/_includes/graphql/customer-output-24.md
CONFLICT (content): Merge conflict in src/_data/toc/graphql.yml1 parent 0aada6a commit 5836415
File tree
39 files changed
+768
-540
lines changed- .github
- src
- _data/toc
- cloud
- architecture
- cdn
- docker
- env
- live
- project
- contributor-guide
- guides
- v2.3
- ext-best-practices/tutorials
- install-gde
- prereq
- performance-best-practices
- release-notes
- v2.4
- install-gde
- prereq
- performance-best-practices
- release-notes
- security
- marketplace/sellers
- quality-patches
- recommendations
39 files changed
+768
-540
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | | - | |
9 | | - | |
10 | | - | |
11 | | - | |
12 | | - | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| |||
23 | 24 | | |
24 | 25 | | |
25 | 26 | | |
| 27 | + | |
| 28 | + | |
26 | 29 | | |
27 | 30 | | |
28 | 31 | | |
29 | 32 | | |
30 | 33 | | |
31 | 34 | | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
32 | 42 | | |
33 | 43 | | |
34 | 44 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
343 | 343 | | |
344 | 344 | | |
345 | 345 | | |
346 | | - | |
| 346 | + | |
347 | 347 | | |
348 | 348 | | |
349 | 349 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
103 | 103 | | |
104 | 104 | | |
105 | 105 | | |
106 | | - | |
107 | | - | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
108 | 124 | | |
109 | 125 | | |
110 | 126 | | |
| |||
153 | 169 | | |
154 | 170 | | |
155 | 171 | | |
156 | | - | |
157 | | - | |
158 | | - | |
159 | | - | |
160 | | - | |
161 | | - | |
162 | | - | |
163 | | - | |
164 | | - | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
148 | 148 | | |
149 | 149 | | |
150 | 150 | | |
151 | | - | |
| 151 | + | |
152 | 152 | | |
153 | 153 | | |
154 | 154 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
5 | | - | |
6 | 4 | | |
7 | 5 | | |
8 | 6 | | |
| |||
89 | 87 | | |
90 | 88 | | |
91 | 89 | | |
92 | | - | |
| 90 | + | |
93 | 91 | | |
94 | 92 | | |
95 | 93 | | |
96 | | - | |
| 94 | + | |
97 | 95 | | |
98 | 96 | | |
99 | 97 | | |
| |||
0 commit comments