Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

ISPConfig 3
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

f15c39e1

Commit f15c39e1 authored 4 years ago by Marius Burkard

Downloads
- Plain Diff

Merge branch '5908-welcome_template_From' into 'develop'

Resolve ""From" in welcome email template"

Closes #5908

See merge request ispconfig/ispconfig3!1319

parents 13b24a87 747265f6

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

server/conf/mail/welcome_email_de.txt 2 additions, 2 deletions

server/conf/mail/welcome_email_de.txt
server/conf/mail/welcome_email_en.txt 2 additions, 2 deletions

server/conf/mail/welcome_email_en.txt
server/conf/mail/welcome_email_es.txt 1 addition, 1 deletion

server/conf/mail/welcome_email_es.txt
server/conf/mail/welcome_email_fr.txt 1 addition, 1 deletion

server/conf/mail/welcome_email_fr.txt
server/conf/mail/welcome_email_hr.txt 2 additions, 2 deletions

server/conf/mail/welcome_email_hr.txt
server/conf/mail/welcome_email_nl.txt 1 addition, 1 deletion

server/conf/mail/welcome_email_nl.txt
server/plugins-available/mail_plugin.inc.php 19 additions, 2 deletions

server/plugins-available/mail_plugin.inc.php

with 28 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment