ISPConfig3 devel
parent: 05481a | patch | commitdiff
Marius Cramer
2014-02-18 8ddcb0d7ac2141b934c789cd7b5cf06f05e730b0
refs
author Marius Cramer <m.cramer@pixcept.de>
Tuesday, February 18, 2014 09:27 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Tuesday, February 18, 2014 09:27 -0500
commit8ddcb0d7ac2141b934c789cd7b5cf06f05e730b0
tree 2eae9375b6095733b294be9fc70a85580016c034 tree | zip | gz
parent 05481a4fa1a30e0879c2939f0eee19c8004efe04 view | diff
c9262595ce156d3c701674108f10a86083fb7bab view | diff 
Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/sites/web_vhost_subdomain_edit.php
	server/plugins-available/cron_plugin.inc.php
10 files modified
37 ■■■■■ changed files
install/dist/lib/opensuse.lib.php 2 ●●●●● diff | view | raw | blame | history
install/dist/tpl/gentoo/apache_apps.vhost.master 4 ●●●●● diff | view | raw | blame | history
install/dist/tpl/gentoo/apache_ispconfig.vhost.master 4 ●●●●● diff | view | raw | blame | history
install/sql/incremental/upd_0068.sql 7 ●●●●● diff | view | raw | blame | history
install/tpl/apache_apps.vhost.master 4 ●●●●● diff | view | raw | blame | history
install/tpl/apache_ispconfig.vhost.master 4 ●●●●● diff | view | raw | blame | history
interface/web/client/form/domain.tform.php 2 ●●●●● diff | view | raw | blame | history
server/conf/apache_apps.vhost.master 2 ●●●●● diff | view | raw | blame | history
server/conf/vhost.conf.master 4 ●●●●● diff | view | raw | blame | history
server/plugins-available/cron_plugin.inc.php 4 ●●●●● diff | view | raw | blame | history