Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 562cdba

Browse files
authored
Merge branch 'master' into patch-3
2 parents 900a1f9 + ff4e28c commit 562cdba

File tree

239 files changed

+96833
-49022
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+96833
-49022
lines changed

_data/codebase/v2_2/commerce/composer_lock.json

Lines changed: 9552 additions & 9430 deletions
Large diffs are not rendered by default.

_data/codebase/v2_2/open-source/composer_lock.json

Lines changed: 9233 additions & 9008 deletions
Large diffs are not rendered by default.

_data/codebase/v2_3/commerce/composer_lock.json

Lines changed: 9723 additions & 9653 deletions
Large diffs are not rendered by default.

_data/codebase/v2_3/open-source/composer_lock.json

Lines changed: 9723 additions & 9653 deletions
Large diffs are not rendered by default.

_data/compatibility.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ versions:
33
- 2.3.0
44
- 2.3.1
55
- 2.3.2
6+
- 2.3.3
67
extension:
78
-
89
name: Amazon Sales Channel
@@ -14,51 +15,66 @@ extension:
1415
2.3.0: general availability
1516
2.3.1: general availability
1617
2.3.2: general availability
18+
2.3.3: general availability
1719
-
1820
name: Google Shopping ads Channel
1921
versions:
22+
-
23+
name: 3.0.1
24+
support:
25+
2.2.4+: general availability
26+
2.3.0: general availability
27+
2.3.1: general availability
28+
2.3.2: general availability
29+
2.3.3: general availability
2030
-
2131
name: 3.0.0
2232
support:
2333
2.2.4+: general availability
2434
2.3.0: general availability
2535
2.3.1: general availability
2636
2.3.2: general availability
37+
2.3.3: general availability
2738
-
2839
name: 2.0.2
2940
support:
3041
2.2.4+: general availability
3142
2.3.0: general availability
3243
2.3.1: general availability
3344
2.3.2: general availability
45+
2.3.3: general availability
3446
-
3547
name: 2.0.1
3648
support:
3749
2.2.4+: general availability
3850
2.3.0: general availability
3951
2.3.1: general availability
4052
2.3.2: general availability
53+
2.3.3: general availability
4154
-
4255
name: 2.0.0
4356
support:
4457
2.2.4+: general availability
4558
2.3.0: general availability
4659
2.3.1: general availability
4760
2.3.2: general availability
61+
2.3.3: general availability
4862
-
4963
name: 1.1.2
5064
support:
5165
2.2.4+: general availability
5266
2.3.0: general availability
5367
2.3.1: general availability
5468
2.3.2: general availability
69+
2.3.3: general availability
5570
-
5671
name: 1.1.1
5772
support:
5873
2.2.4+: general availability
5974
2.3.0: general availability
6075
2.3.1: general availability
6176
2.3.2: general availability
77+
2.3.3: general availability
6278
-
6379
name: Magento Shipping
6480
versions:
@@ -86,6 +102,14 @@ extension:
86102
-
87103
name: Magento Inventory
88104
versions:
105+
-
106+
name: 1.6.1
107+
support:
108+
2.2.4+: not supported
109+
2.3.0: general availability
110+
2.3.1: general availability
111+
2.3.2: general availability
112+
2.3.3: general availability
89113
-
90114
name: 1.1.2
91115
support:
@@ -117,3 +141,4 @@ extension:
117141
2.3.0: open beta
118142
2.3.1: general availability
119143
2.3.2: general availability
144+
2.3.3: general availability

_data/toc/configuration-guide.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,9 @@ pages:
393393
- label: Example - logging database activity
394394
url: /config-guide/log/log-db.html
395395

396+
- label: Example - logging to a custom log file
397+
url: /config-guide/log/custom-logger-handler.html
398+
396399
- label: How to locate your session files
397400
url: /config-guide/sessions.html
398401

_data/toc/frontend-developer-guide.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ pages:
124124
- label: Using custom fonts
125125
url: /frontend-dev-guide/css-topics/using-fonts.html
126126

127+
- label: CSS critical path
128+
url: /frontend-dev-guide/css-topics/css-critical-path.html
129+
127130
- label: Using custom CSS preprocessor
128131
children:
129132

0 commit comments

Comments
 (0)