gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Marius Cramer

2014-02-03 9893e01f6de6b225bbc84bff49ec673164035892

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Monday, February 3, 2014 14:11 -0500
committer	Marius Cramer <m.cramer@pixcept.de>
	Monday, February 3, 2014 14:11 -0500
commit	9893e01f6de6b225bbc84bff49ec673164035892
tree	27bb697b632539d87814ecf4f17d9cc21b54923f tree \| zip \| gz
parent	bca1af513a99742c23cf3e1e49e74a7f42b13d41 view \| diff e20f18f30fda868354abf9088d8319bcc64fe912 view \| diff

Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/lib/classes/remoting.inc.php
	server/cron_daily.php

11 files modified

1 files added

	install/dist/lib/fedora.lib.php	4 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/incremental/upd_0066.sql	2 ●●●●● diff \| view \| raw \| blame \| history
	install/sql/ispconfig3.sql	8 ●●●●● diff \| view \| raw \| blame \| history
	install/tpl/fedora_postfix.conf.master	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/lib/app.inc.php	42 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/lib/remote.conf.php	2 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/admin/system_config_edit.php	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/lib/lang/en_resync.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/resync.php	45 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/tools/templates/resync.htm	6 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/apache2_plugin.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/nginx_plugin.inc.php	2 ●●●●● diff \| view \| raw \| blame \| history