gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

floria030

2014-02-05 7883fc5763a197838718507f572e44572ac23177

refs
author	floria030 <florian@schaal-24.de>
	Wednesday, February 5, 2014 05:51 -0500
committer	floria030 <florian@schaal-24.de>
	Wednesday, February 5, 2014 05:51 -0500
commit	7883fc5763a197838718507f572e44572ac23177
tree	10aea3dc9b8463566d299f1905492a9ff62bc92f tree \| zip \| gz
parent	ae3cf84b06cb28f1e5f32fa02adad97b9e1ae68f view \| diff 9893e01f6de6b225bbc84bff49ec673164035892 view \| diff

Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

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