merge solved conflicts

2017-06-01 08:29:01 +02:00 · 2017-06-01 08:29:01 +02:00 · 8815b927ac
parent b9c43ec961 5507c84670
commit 8815b927ac
1 changed files with 0 additions and 27 deletions
--- a/services/mailer/Application/config.json
+++ b/services/mailer/Application/config.json
@ -1,27 +0,0 @@
-{
-    "name": "MailServer",
-    "version": "0.0.1",
-    "port": 3003,
-    "debug": true,
-    "smtp": {
-        "host": "smtp.verdnatura.es",
-        "port": 465,
-        "secure": true,
-        "auth": {
-            "user": "nocontestar",
-            "pass": "ub606cux7op"
-        },
-        "tls":{
-            "rejectUnauthorized": false
-        }
-    },
-    "senderMail": "nocontestar@verdnatura.es",
-    "senderName": "VerdNatura",
-    "mysql": {
-            "host": "test-db.verdnatura.es",
-            "port": 3307,
-            "user": "reports",
-            "password": "78ZZv9xsjwRi1j2T",
-            "database": "vn2008"
-    }
-}