gitlabFork/ISPConfig3.git - Solinfo Gitblit

ISPConfig3 devel

Merge branch 'convert_to_reseller' into 'master'

Marius Cramer

2014-08-14 c56175b5781ee8a20bebe3015bcbe8ea68b9c8b7

refs
author	Marius Cramer <m.cramer@pixcept.de>
	Thursday, August 14, 2014 05:04 -0400
committer	Marius Cramer <m.cramer@pixcept.de>
	Thursday, August 14, 2014 05:04 -0400
commit	c56175b5781ee8a20bebe3015bcbe8ea68b9c8b7
tree	29e9b74912fb24f8cc74c1923a27e2c861bf490e tree \| zip \| gz
parent	c0914f828a0087636eb775c984680a410d975494 view \| diff 7e509f5a50414ab50e67c0b58fb37697f92615d1 view \| diff

Merge branch 'convert_to_reseller' into 'master'

Convert to reseller

Fixes FS#925 http://bugtracker.ispconfig.org/index.php?do=details&task_id=925

See merge request !117

4 files modified

	interface/web/client/client_edit.php	6 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/en_client.lng	1 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/lib/lang/es_client.lng	3 ●●●●● diff \| view \| raw \| blame \| history
	interface/web/client/templates/client_edit_limits.htm	6 ●●●●● diff \| view \| raw \| blame \| history