ISPConfig3 devel
parent: ba5d83 | patch | commitdiff
Marius Cramer
2014-02-10 738c3d47f74d8a117175452aac2cd662b0e3b95b
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, February 10, 2014 09:14 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Monday, February 10, 2014 09:14 -0500
commit738c3d47f74d8a117175452aac2cd662b0e3b95b
tree 1fcc6fbf1a59d510b0355febafac2dc3fc6a4f28 tree | zip | gz
parent ba5d83151d0616fdd27ef668cf806e57052ce131 view | diff
b34f99dabb9ee413856344652e91bff831d3919a view | diff 
Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	interface/lib/config.inc.php
	interface/web/admin/lib/lang/de_system_config.lng
15 files modified
1 files added
178 ■■■■■ changed files
install/dist/lib/fedora.lib.php 8 ●●●●● diff | view | raw | blame | history
install/dist/lib/gentoo.lib.php 12 ●●●●● diff | view | raw | blame | history
install/dist/lib/opensuse.lib.php 8 ●●●●● diff | view | raw | blame | history
install/lib/install.lib.php 37 ●●●●● diff | view | raw | blame | history
install/lib/installer_base.lib.php 8 ●●●●● diff | view | raw | blame | history
install/lib/update.lib.php 4 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/system_config.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_system_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_system_config.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/system_config_mail_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/client/domain_edit.php 58 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/domain_edit.htm 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/shell_user_edit.php 4 ●●●●● diff | view | raw | blame | history
server/scripts/ispconfig_update.php 4 ●●●●● diff | view | raw | blame | history
server/scripts/update_from_dev.sh 11 ●●●●● diff | view | raw | blame | history
server/scripts/update_from_svn.sh 8 ●●●●● diff | view | raw | blame | history