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

08791fea

Commit 08791fea authored 9 years ago by A. Täffner

Downloads
- Plain Diff

Test: Merge branch 'master' into dns-dnssec

Conflicts:
	install/lib/installer_base.lib.php

parents 228e0396 ab3c7dfb

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

install/dist/conf/centos70.conf.php 1 addition, 1 deletion

install/dist/conf/centos70.conf.php
install/lib/installer_base.lib.php 3 additions, 3 deletions

install/lib/installer_base.lib.php
interface/web/dns/dns_wizard.php 1 addition, 0 deletions

interface/web/dns/dns_wizard.php
interface/web/dns/form/dns_cname.tform.php 1 addition, 1 deletion

interface/web/dns/form/dns_cname.tform.php
interface/web/mail/lib/lang/el_mail_domain.lng 9 additions, 0 deletions

interface/web/mail/lib/lang/el_mail_domain.lng
interface/web/mail/lib/lang/ru_mail_domain.lng 9 additions, 0 deletions

interface/web/mail/lib/lang/ru_mail_domain.lng

with 24 additions and 5 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