Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit a3c6f17

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: Fix deprecated swiftmailer parameter
2 parents f5766c7 + 5311659 commit a3c6f17

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/config/config_dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@ monolog:
3131
# level: info
3232

3333
#swiftmailer:
34-
# delivery_address: me@example.com
34+
# delivery_addresses: ['me@example.com']

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"symfony/symfony": "2.8.*",
1313
"doctrine/orm": "^2.4.8",
1414
"doctrine/doctrine-bundle": "~1.4",
15-
"symfony/swiftmailer-bundle": "~2.3",
15+
"symfony/swiftmailer-bundle": "~2.3,>=2.3.10",
1616
"symfony/monolog-bundle": "~2.11.3",
1717
"sensio/distribution-bundle": "~5.0",
1818
"sensio/framework-extra-bundle": "^3.0.2",

0 commit comments

Comments
 (0)