Skip to content

Commit 793c3cb

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: Mentioning svelte as aa valid loader override type Force SimpleBus https url Fix Stumptown Syndicate guideline broken link
2 parents 4c6a373 + 550d992 commit 793c3cb

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

components/messenger.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -347,4 +347,4 @@ Learn more
347347
/messenger/*
348348

349349
.. _`blog posts about command buses`: https://matthiasnoback.nl/tags/command%20bus/
350-
.. _`SimpleBus project`: http://docs.simplebus.io/en/latest/
350+
.. _`SimpleBus project`: https://docs.simplebus.io/en/latest/

contributing/code_of_conduct/reporting_guidelines.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,6 @@ Reporting Guidelines derived from those of the `Stumptown Syndicate`_ and the
9393

9494
Adopted by `Symfony`_ organizers on 21 February 2018.
9595

96-
.. _`Stumptown Syndicate`: http://stumptownsyndicate.org/code-of-conduct/reporting-guidelines/
96+
.. _`Stumptown Syndicate`: https://github.com/stumpsyn/policies/blob/master/reporting_guidelines.md/
9797
.. _`Django Software Foundation`: https://www.djangoproject.com/conduct/reporting/
9898
.. _`Symfony`: https://symfony.com

frontend/encore/advanced-config.rst

+1
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,7 @@ The following loaders are configurable with ``configureLoaderRule()``:
230230
- ``sass`` (alias ``scss``)
231231
- ``less``
232232
- ``stylus``
233+
- ``svelte``
233234
- ``vue``
234235
- ``eslint``
235236
- ``typescript`` (alias ``ts``)

0 commit comments

Comments
 (0)