Merge branch 'development'

os2display · Feb 1, 2019 · e71a6be · e71a6be
2 parents 3320357 + 0fb0994
commit e71a6be
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 5.1.2
+
+* Merged https://github.com/os2display/admin/pull/17
+
 ## 5.1.1
 
 * Updated symfony/symfony: 2.8.44

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -70,6 +70,7 @@ swiftmailer:
   transport: "%mailer_transport%"
   host:      "%mailer_host%"
   username:  "%mailer_user%"
+  port:      "%mailer_port%"
   password:  "%mailer_password%"
   spool:     { type: memory }
 

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -9,6 +9,7 @@ parameters:
 
     mailer_transport:  sendmail
     mailer_host:       127.0.0.1
+    mailer_port:       25
     mailer_user:       ~
     mailer_password:   ~
     mailer_from_email: [email protected]