[UPMERGE] 1.12 -> 1.13 (#15702)

This PR has been generated automatically. For more details see [upmerge_pr.yaml](/Sylius/Sylius/blob/1.13/.github/workflows/upmerge_pr.yaml). **Remember!** The upmerge should always be merged with using `Merge pull request` button. In case of conflicts, please resolve them manually with usign the following commands: ``` git fetch upstream gh pr checkout git merge upstream/1.13 --no-commit ``` If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/Sylius` repository. Once the conflicts are resolved, please run `git merge --continue` and change the commit title to ``` Resolve conflicts between 1.12 and 1.13 ```
Sylius · Jan 5, 2024 · a0ad0d1 · a0ad0d1
2 parents 69c1349 + a4fbc3f
commit a0ad0d1
Show file tree

Hide file tree

Showing 41 changed files with 41 additions and 41 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/docs/book/contributing/code/license.rst b/docs/book/contributing/code/license.rst
@@ -14,7 +14,7 @@ According to `Wikipedia`_:
 The License
 -----------
 
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/docs/conf.py b/docs/conf.py
@@ -17,7 +17,7 @@
 source_suffix = '.rst'
 master_doc = 'index'
 project = 'Sylius'
-copyright = u'2011-2023, Sylius Sp. z o.o.'
+copyright = u'2011-2024, Sylius Sp. z o.o.'
 version = ''
 release = ''
 exclude_patterns = ['_includes/*.rst']

diff --git a/src/Sylius/Bundle/AddressingBundle/LICENSE b/src/Sylius/Bundle/AddressingBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/AdminBundle/LICENSE b/src/Sylius/Bundle/AdminBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/AttributeBundle/LICENSE b/src/Sylius/Bundle/AttributeBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/ChannelBundle/LICENSE b/src/Sylius/Bundle/ChannelBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/CurrencyBundle/LICENSE b/src/Sylius/Bundle/CurrencyBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/CustomerBundle/LICENSE b/src/Sylius/Bundle/CustomerBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/InventoryBundle/LICENSE b/src/Sylius/Bundle/InventoryBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/LocaleBundle/LICENSE b/src/Sylius/Bundle/LocaleBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/MoneyBundle/LICENSE b/src/Sylius/Bundle/MoneyBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/OrderBundle/LICENSE b/src/Sylius/Bundle/OrderBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/PaymentBundle/LICENSE b/src/Sylius/Bundle/PaymentBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/PayumBundle/LICENSE b/src/Sylius/Bundle/PayumBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/ProductBundle/LICENSE b/src/Sylius/Bundle/ProductBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/PromotionBundle/LICENSE b/src/Sylius/Bundle/PromotionBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/ReviewBundle/LICENSE b/src/Sylius/Bundle/ReviewBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/ShippingBundle/LICENSE b/src/Sylius/Bundle/ShippingBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/ShopBundle/LICENSE b/src/Sylius/Bundle/ShopBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/TaxationBundle/LICENSE b/src/Sylius/Bundle/TaxationBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/TaxonomyBundle/LICENSE b/src/Sylius/Bundle/TaxonomyBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/UiBundle/LICENSE b/src/Sylius/Bundle/UiBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Bundle/UserBundle/LICENSE b/src/Sylius/Bundle/UserBundle/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Addressing/LICENSE b/src/Sylius/Component/Addressing/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Attribute/LICENSE b/src/Sylius/Component/Attribute/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Channel/LICENSE b/src/Sylius/Component/Channel/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Core/LICENSE b/src/Sylius/Component/Core/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Currency/LICENSE b/src/Sylius/Component/Currency/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Customer/LICENSE b/src/Sylius/Component/Customer/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Inventory/LICENSE b/src/Sylius/Component/Inventory/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Locale/LICENSE b/src/Sylius/Component/Locale/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Order/LICENSE b/src/Sylius/Component/Order/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Payment/LICENSE b/src/Sylius/Component/Payment/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Product/LICENSE b/src/Sylius/Component/Product/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Promotion/LICENSE b/src/Sylius/Component/Promotion/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Review/LICENSE b/src/Sylius/Component/Review/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Shipping/LICENSE b/src/Sylius/Component/Shipping/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Taxation/LICENSE b/src/Sylius/Component/Taxation/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/Taxonomy/LICENSE b/src/Sylius/Component/Taxonomy/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/Sylius/Component/User/LICENSE b/src/Sylius/Component/User/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2023 Sylius Sp. z o.o.
+Copyright (c) 2011-2024 Sylius Sp. z o.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal