|
nicofuma
|
aa7ca1993d2795a5a3f392322f4e21a427353c28
aa7ca1993d2795a5a3f392322f4e21a427353c28 |
Merge branch '3.2.x'
* 3.2.x:
[ticket/15006] Pass inherit settings to form and use correct button |
|
|
nicofuma
|
f7ccd7af8ef529bd8a43b8a3e0b342f9b228d961
m f7ccd7af8ef529bd8a43b8a3e0b342f9b228d961 |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/15006] Pass inherit settings to form and use correct button |
|
|
nicofuma
|
dcadfe092c16b539121d2118169419ed01a6cc2c
m dcadfe092c16b539121d2118169419ed01a6cc2c |
Merge pull request #4665 from marc1706/ticket/15006
[ticket/15006] Pass inherit settings to form and use correct button
* marc1706/ticket/15006:
[ticket/15006] Pass inherit settings to form and use correct button |
|
|
nicofuma
|
34866b2db1dfbe2ba2c92fda3791a880498c198b
34866b2db1dfbe2ba2c92fda3791a880498c198b |
Merge branch '3.2.x'
* 3.2.x:
[ticket/15015] Use correct explain string for enable email settings |
|
|
nicofuma
|
3dfc882d1a83b1b2e3769d6530c8d351e3c86e40
m 3dfc882d1a83b1b2e3769d6530c8d351e3c86e40 |
Merge pull request #4668 from marc1706/ticket/15015
[ticket/15015] Use correct explain string for enable email settings
* marc1706/ticket/15015:
[ticket/15015] Use correct explain string for enable email settings |
|