merge dev

This commit is contained in:
Jay_Makwana
2019-11-18 19:50:29 +05:30
19 changed files with 3106 additions and 356 deletions

View File

@ -569,9 +569,19 @@ export default {
host: 'Mail Host',
port: 'Mail Port',
driver: 'Mail Driver',
domain: 'Domain',
secret: 'Secret',
sparkpost_secret: 'Sparkpost Secret',
mailgin_secret: 'Mailgun Secret',
ses_secret: 'SES Secret',
mandrill_secret: 'Mandrill Secret',
ses_key: 'SES Key',
password: 'Mail Password',
username: 'Mail Username',
endpoint: 'Mail Endpoint',
mail_config: 'Mail Configuration',
from_name: 'From Mail Name',
from_mail: 'From Mail Address',
encryption: 'Mail Encryption',
mail_config_desc: 'Below details will be used to update the mail environment. Also you can change the details anytime after logging in.'
},
@ -737,9 +747,19 @@ export default {
host: 'Mail Host',
port: 'Mail Port',
driver: 'Mail Driver',
domain: 'Domain',
secret: 'Secret',
sparkpost_secret: 'Sparkpost Secret',
mailgin_secret: 'Mailgun Secret',
ses_secret: 'SES Secret',
mandrill_secret: 'Mandrill Secret',
ses_key: 'SES Key',
password: 'Mail Password',
username: 'Mail Username',
endpoint: 'Mail Endpoint',
mail_config: 'Mail Configuration',
from_name: 'From Mail Name',
from_mail: 'From Mail Address',
encryption: 'Mail Encryption',
mail_config_desc: 'Below details will be used to update the mail environment. Also you can change the details anytime after logging in.'
},