ISPConfig3 devel
parent: be9026 | patch | commitdiff
Marius Burkard
2016-05-03 50922784c5d6b5206a830c73b467e1551f4cda5c
refs
author Marius Burkard <m.burkard@pixcept.de>
Tuesday, May 3, 2016 09:14 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Tuesday, May 3, 2016 09:14 -0400
commit50922784c5d6b5206a830c73b467e1551f4cda5c
tree c29ae725d8a2a3ae9ee6e658df4eacb809d00c89 tree | zip | gz
parent be90262e383405bd4c3839d7b969ce21257ed75f view | diff
f43994cca340165770db223e116fd81e9ab7b429 view | diff 
Merge branch 'stable-3.1' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.1
33 files modified
53 ■■■■■ changed files
interface/lib/classes/tform_base.inc.php 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/system_config_domains_edit.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/domain_list.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/dashlets/templates/modules.htm 4 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ar_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/bg_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/br_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ca_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/cz_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/de_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/el_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/en_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/es_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/fi_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/fr_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/hr_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/hu_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/id_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/it_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ja_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/nl_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/pl_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/pt_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ro_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/ru_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/se_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/sk_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dashboard/lib/lang/tr_dashlet_modules.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_alias.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/dns/form/dns_soa.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 1 ●●●●● diff | view | raw | blame | history