Marius Cramer
2014-04-09 465f2bbfb524dc21021f71e78e8a2ab31a064d93
refs
author Marius Cramer <m.cramer@pixcept.de>
Wednesday, April 9, 2014 12:30 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Wednesday, April 9, 2014 12:30 -0400
commit465f2bbfb524dc21021f71e78e8a2ab31a064d93
tree 673efc3e2a8b07fa265e5b28e3032963231d2e50 tree | zip | gz
parent 121e4d6406168ad7935d5e62ab7268d60315cbdb view | diff
ca4b71c1db5981433efc68f7c032b8dac588b6d5 view | diff
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
18 files modified
138 ■■■■■ changed files
install/lib/installer_base.lib.php 7 ●●●●● diff | view | raw | blame | history
interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php 34 ●●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 2 ●●● diff | view | raw | blame | history
interface/web/client/domain_edit.php 4 ●●●● diff | view | raw | blame | history
interface/web/dns/dns_import.php 4 ●●●● diff | view | raw | blame | history
interface/web/dns/dns_slave_edit.php 4 ●●●● diff | view | raw | blame | history
interface/web/dns/dns_soa_edit.php 4 ●●●● diff | view | raw | blame | history
interface/web/dns/dns_wizard.php 4 ●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_get.lng 2 ●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_edit.php 4 ●●●● diff | view | raw | blame | history
interface/web/mail/mail_mailinglist_edit.php 4 ●●●● diff | view | raw | blame | history
interface/web/sites/cron_edit.php 14 ●●●● diff | view | raw | blame | history
interface/web/sites/database_user_edit.php 4 ●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_cron.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_edit.php 4 ●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_subdomain_edit.php 35 ●●●● diff | view | raw | blame | history
interface/web/vm/openvz_vm_edit.php 4 ●●●● diff | view | raw | blame | history