Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Snippets Groups Projects

513a1785

Commit 513a1785 authored 10 years ago by Marius Cramer

Downloads
- Plain Diff

Merge branch 'master' into 'master'

Master

See merge request !150

parents c4c549ef 0e72ef1f

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

install/sql/incremental/upd_0081.sql 19 additions, 0 deletions

install/sql/incremental/upd_0081.sql
install/sql/ispconfig3.sql 2 additions, 1 deletion

install/sql/ispconfig3.sql
interface/web/dns/dns_dkim_edit.php 1 addition, 1 deletion

interface/web/dns/dns_dkim_edit.php
interface/web/dns/lib/lang/fr_dns_wizard.lng 1 addition, 1 deletion

interface/web/dns/lib/lang/fr_dns_wizard.lng
interface/web/mail/lib/lang/es_mail_get.lng 1 addition, 1 deletion

interface/web/mail/lib/lang/es_mail_get.lng
interface/web/mail/mail_domain_dkim_create.php 2 additions, 2 deletions

interface/web/mail/mail_domain_dkim_create.php
interface/web/sites/lib/remote.conf.php 1 addition, 2 deletions

interface/web/sites/lib/remote.conf.php
server/plugins-available/mail_plugin.inc.php 1 addition, 1 deletion

server/plugins-available/mail_plugin.inc.php

with 28 additions and 9 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