Commit 82b723d
Marius Cramer
Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts:
interface/lib/classes/remoting.inc.php
interface/web/dns/lib/lang/cz_dns_dkim.lng
interface/web/mail/lib/lang/cz_mail_backup_list.lng
interface/web/mail/lib/lang/cz_mail_user.lng
interface/web/sites/lib/lang/cz_web_childdomain.lng
interface/web/sites/lib/lang/cz_web_childdomain_list.lng
interface/web/sites/lib/lang/cz_web_subdomain_list.lng
interface/web/sites/lib/lang/cz_web_vhost_domain.lng
interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
interface/web/sites/web_vhost_domain_edit.phpFile tree
104 files changed
+2324
-4514
lines changed- docs
- under_development
- install
- dist/lib
- lib
- classes
- tpl
- interface
- lib
- classes/remote.d
- lang
- plugins
- web
- admin/lib/lang
- client/lib/lang
- dashboard/lib/lang
- designer/lib/lang
- dns/lib/lang
- help/lib/lang
- login/lib/lang
- mailuser/lib/lang
- mail/lib/lang
- sites
- lib/lang
- tools/lib/lang
- server/conf
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
104 files changed
+2324
-4514
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
This file was deleted.
0 commit comments