ISPConfig3 devel
parent: add280 | patch | commitdiff
Marius Cramer
2014-04-10 363ccfedb96d98cb6f03fd2ca44096dcb24c2c7f
refs
author Marius Cramer <m.cramer@pixcept.de>
Thursday, April 10, 2014 03:07 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Thursday, April 10, 2014 03:07 -0400
commit363ccfedb96d98cb6f03fd2ca44096dcb24c2c7f
tree 453546e2c970ba2e1a58ba4076e5f60317c3e150 tree | zip | gz
parent add2800ad0b1c0b180bf4b41cf34165fd3c80b7b view | diff
a246ffd76e02519a11bbe8bc0c332c185049835c view | diff 
Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php
	interface/web/mail/lib/lang/de_mail_get.lng
	interface/web/sites/lib/lang/de_cron.lng
	interface/web/sites/lib/lang/en_cron.lng
	interface/web/sites/web_vhost_subdomain_edit.php
1 files added
23 files modified
116 ■■■■■ changed files
install/lib/installer_base.lib.php 7 ●●●●● diff | view | raw | blame | history
install/lib/update.lib.php 4 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0073.sql 4 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 5 ●●●●● diff | view | raw | blame | history
interface/lib/plugins/sites_web_vhost_domain_plugin.inc.php 26 ●●●●● 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/form/mail_get.tform.php 2 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/de_mail_get.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/mail/lib/lang/en_mail_get.lng 1 ●●●●● 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/mail/templates/mail_get_edit.htm 2 ●●●●● 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_vhost_domain_edit.php 4 ●●●●● diff | view | raw | blame | history
interface/web/vm/openvz_vm_edit.php 4 ●●●●● diff | view | raw | blame | history
server/conf/php_fpm_pool.conf.master 2 ●●●●● diff | view | raw | blame | history