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

dbf29d99

Commit dbf29d99 authored 10 years ago by Marius Cramer

Downloads
- Plain Diff

Merge branch 'master' of http://git.ispconfig.org/Cambra/ispconfig3 into Cambra/ispconfig3-master

Conflicts:
	interface/lib/lang/es.lng

parents 47568c88 5dc7c8f6

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

interface/lib/classes/auth.inc.php 1 addition, 1 deletion

interface/lib/classes/auth.inc.php
interface/lib/lang/en.lng 1 addition, 0 deletions

interface/lib/lang/en.lng
interface/lib/lang/es.lng 1 addition, 0 deletions

interface/lib/lang/es.lng
interface/web/client/domain_edit.php 26 additions, 4 deletions

interface/web/client/domain_edit.php
interface/web/client/domain_list.php 5 additions, 0 deletions

interface/web/client/domain_list.php
interface/web/client/templates/domain_edit.htm 1 addition, 7 deletions

interface/web/client/templates/domain_edit.htm
interface/web/client/templates/domain_list.htm 10 additions, 0 deletions

interface/web/client/templates/domain_list.htm

with 45 additions and 12 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