gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Florian Schaal

2016-01-16 f0b03be2a39f1bc31fa3488bd457fadb878a32cd

refs
author	Florian Schaal <florian@schaal-24.de>
	Saturday, January 16, 2016 04:43 -0500
committer	Florian Schaal <florian@schaal-24.de>
	Saturday, January 16, 2016 04:43 -0500
commit	f0b03be2a39f1bc31fa3488bd457fadb878a32cd
tree	ca4a2f9d1170a9a5784b98ba0f56fb72c4afe4b6 tree \| zip \| gz
parent	bad4bd31db037d017692ec3b573dea60143f0dbd view \| diff a713050f095c7b94c29b8e7ccadd71bcab1af4eb view \| diff

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

Conflicts:
	interface/web/client/form/reseller.tform.php

5 files modified

	interface/web/sites/shell_user_edit.php	23 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/sites/templates/shell_user_advanced.htm	36 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/nginx_plugin.inc.php	8 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/shelluser_base_plugin.inc.php	4 ●●●●● diff \| view \| raw \| blame \| history
	server/plugins-available/shelluser_jailkit_plugin.inc.php	5 ●●●●● diff \| view \| raw \| blame \| history