Commitf50e801

committed

Merge branch '5.1' into 5.2

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

2 parents453714f +b25e17a commitf50e801Copy full SHA for f50e801

File tree

-12

lines changed

-12

lines changed

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,6 @@ Configuration`
`183`	`183`	* `sender`_
`184`	`184`	* `recipients`_
`185`	`185`
`186`		- *:ref:`headers<mailer-headers>`
`187`		`-`
`188`	`186`	* `php_errors`_
`189`	`187`
`190`	`188`	* `log`_
`@@ -3077,16 +3075,6 @@ recipients set in the code.`
`3077`	`3075`	`]);`
`3078`	`3076`	`};`
`3079`	`3077`
`3080`		`-.. _mailer-headers:`
`3081`		`-`
`3082`		`-headers`
`3083`		`-.......`
`3084`		`-`
`3085`		-type: ``array``
`3086`		`-`
`3087`		-Headers to add to emails. key (``name`` attribute in xml format)
`3088`		`-is the header name and value the header value.`
`3089`		`-`
`3090`	`3078`	`workflows`
`3091`	`3079`	`~~~~~~~~~`
`3092`	`3080`

Comments

(0)