ISPConfig3 devel
parent: 919c23 | patch | commitdiff
Marius Cramer
2014-10-31 1102cc886cf42a23cb3145cd9cc8b0d8f6123b61
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, October 31, 2014 07:46 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Friday, October 31, 2014 07:46 -0400
commit1102cc886cf42a23cb3145cd9cc8b0d8f6123b61
tree 41ed9c771021a9ffad192fa988afbcf4314a7b1b tree | zip | gz
parent 919c23676940bee3a7b21ec98700ea74152f1615 view | diff
c91c7a6249cdbcd235fc17f6bc4104d6da93a1d9 view | diff 
Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	install/uninstall.php
	interface/lib/config.inc.php
	interface/web/themes/blue/ispconfig_version
9 files modified
50 ■■■■■ changed files
install/install.php 2 ●●●●● diff | view | raw | blame | history
install/lib/install.lib.php 3 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 8 ●●●●● diff | view | raw | blame | history
install/update.php 2 ●●●●● diff | view | raw | blame | history
interface/lib/classes/db_mysql.inc.php 5 ●●●●● diff | view | raw | blame | history
interface/lib/classes/tform_actions.inc.php 4 ●●●●● diff | view | raw | blame | history
server/lib/classes/monitor_tools.inc.php 3 ●●●●● diff | view | raw | blame | history
server/lib/classes/system.inc.php 12 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 11 ●●●●● diff | view | raw | blame | history