gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Burkard

2016-06-07 b63119417fe6e4bbcd072108d7dec927ee879d4a

refs
author	Marius Burkard <m.burkard@pixcept.de>
	Tuesday, June 7, 2016 12:47 -0400
committer	Marius Burkard <m.burkard@pixcept.de>
	Tuesday, June 7, 2016 12:47 -0400
commit	b63119417fe6e4bbcd072108d7dec927ee879d4a
tree	69f03acf92e7d399298c229d0351820f677c9dc1 tree \| zip \| gz
parent	8c6a4706f8bf375738197ed83d1f91d8a17032ef view \| diff 0dfb2d97da6b25c20c8de3d766c81077837f7387 view \| diff

Merge branch 'stable-3.1'

2 files added

17 files modified

1 files deleted

	install/dist/conf/debiantesting.conf.php	230 ●●●●● diff \| view \| raw \| blame \| history
	install/dist/lib/ubuntu1604.lib.php	35 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/install.lib.php	7 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/installer_base.lib.php	3 ●●●●● diff \| view \| raw \| blame \| history
	install/lib/update.lib.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/classes/tform_base.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/templates/system_config_dns_edit.htm	20 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dashboard/lib/lang/pl_dashlet_modules.lng	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/dns/dns_import.php	11 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/database_quota_stats.php	4 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/database_user_edit.htm	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/web_vhost_domain_edit.php	31 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/cron.d/900-letsencrypt.inc.php	24 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/monitor_tools.inc.php	28 ●●●●● diff \| view \| raw \| blame \| history
	server/lib/classes/system.inc.php	31 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/apache2_plugin.inc.php	12 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/cron_plugin.inc.php	6 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/mail_plugin.inc.php	8 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/mail_plugin_dkim.inc.php	21 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/nginx_plugin.inc.php	13 ●●●●● diff \| view \| raw \| blame \| history