Commitb25e17a

committed

Merge branch '4.4' into 5.1

* 4.4: [#14083] Revert mailer.headers option in 4.4 - 5.1

2 parents676403e +34ad0b7 commitb25e17aCopy full SHA for b25e17a

File tree

-12

lines changed

-12

lines changed

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -160,8 +160,6 @@ Configuration`
`160`	`160`	* `sender`_
`161`	`161`	* `recipients`_
`162`	`162`
`163`		- *:ref:`headers<mailer-headers>`
`164`		`-`
`165`	`163`	* `php_errors`_
`166`	`164`
`167`	`165`	* `log`_
`@@ -2883,16 +2881,6 @@ recipients set in the code.`
`2883`	`2881`	`]);`
`2884`	`2882`	`};`
`2885`	`2883`
`2886`		`-.. _mailer-headers:`
`2887`		`-`
`2888`		`-headers`
`2889`		`-.......`
`2890`		`-`
`2891`		-type: ``array``
`2892`		`-`
`2893`		-Headers to add to emails. key (``name`` attribute in xml format)
`2894`		`-is the header name and value the header value.`
`2895`		`-`
`2896`	`2884`	`workflows`
`2897`	`2885`	`~~~~~~~~~`
`2898`	`2886`

Comments

(0)