Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Snippets Groups Projects

c582da17

Commit c582da17 authored 10 years ago by Marius Cramer

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Master

See merge request !167

parents a0731012 412fe889

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

interface/web/dns/lib/lang/de_dns_dmarc.lng 15 additions, 15 deletions

interface/web/dns/lib/lang/de_dns_dmarc.lng
interface/web/dns/lib/lang/de_dns_spf.lng 2 additions, 2 deletions

interface/web/dns/lib/lang/de_dns_spf.lng
interface/web/dns/templates/dns_dmarc_edit.htm 140 additions, 77 deletions

interface/web/dns/templates/dns_dmarc_edit.htm
interface/web/dns/templates/dns_spf_edit.htm 6 additions, 4 deletions

interface/web/dns/templates/dns_spf_edit.htm
interface/web/mail/templates/mail_domain_edit.htm 1 addition, 1 deletion

interface/web/mail/templates/mail_domain_edit.htm

with 164 additions and 99 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