gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2015-05-13 72773a6744609fdbc3bf39f58f073b05bd074c70

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, May 13, 2015 02:50 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Wednesday, May 13, 2015 02:50 -0400
commit	72773a6744609fdbc3bf39f58f073b05bd074c70
tree	cc48eb3e2ce00eea61fe4fcd39e511bc28511a7b tree \| zip \| gz
parent	c2470177339f1db5bb5750dd955285b1b63c25e3 view \| diff 0d73295b42edb4d0dbd7d6727af6939d95cdb963 view \| diff

Merge branch 'stable-3.0.5'

Conflicts:
	install/dist/lib/fedora.lib.php
	install/dist/lib/opensuse.lib.php
	install/lib/installer_base.lib.php
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	interface/lib/classes/aps_crawler.inc.php
	interface/lib/classes/auth.inc.php
	interface/lib/classes/plugin_backuplist.inc.php
	interface/lib/config.inc.php
	interface/lib/plugins/mail_user_filter_plugin.inc.php
	interface/web/login/password_reset.php
	interface/web/sites/templates/web_backup_list.htm
	interface/web/sites/webdav_user_edit.php
	interface/web/themes/blue/ispconfig_version
	server/plugins-available/backup_plugin.inc.php
	server/plugins-available/shelluser_base_plugin.inc.php

12 files modified

	install/dist/conf/centos70.conf.php	6 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/lib/fedora.lib.php	2 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/lib/opensuse.lib.php	1 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/install.lib.php	6 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/installer_base.lib.php	5 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/aps_crawler.inc.php	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/plugin_backuplist.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/plugins/mail_user_filter_plugin.inc.php	80 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/webdav_user_edit.php	10 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/monitor_tools.inc.php	5 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/bind_plugin.inc.php	4 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/shelluser_base_plugin.inc.php	116 ●●●●● diff \| view \| raw \| blame \| history