Skip to content

Commit 6f78a1f

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: [Encore] Fixed typo fix indention
2 parents 3d6ab44 + d46c034 commit 6f78a1f

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

components/config/definition.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ In YAML you may have:
476476
.. code-block:: yaml
477477
478478
# This value is only used for the search results page.
479-
entries_per_page: 25
479+
entries_per_page: 25
480480
481481
and in XML:
482482

frontend/encore/babel.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ The ``@babel/preset-env`` preset rewrites your JavaScript so that the final synt
4141
will work in whatever browsers you want. To configure the browsers that you need
4242
to support, see :ref:`browserslist_package_config`.
4343

44-
After change our "browerslist" config, you will need to manually remove the babel
44+
After changing your "browserslist" config, you will need to manually remove the babel
4545
cache directory:
4646

4747
.. code-block:: terminal

0 commit comments

Comments
 (0)