Marius Cramer
2013-11-20 f386c610180e7864d002a42667f3eb973c749ece
refs
author Marius Cramer <m.cramer@pixcept.de>
Wednesday, November 20, 2013 13:14 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Wednesday, November 20, 2013 13:14 -0500
commitf386c610180e7864d002a42667f3eb973c749ece
tree ea2f3747389e6023a9fffee57164ec4f8dc9cfa3 tree | zip | gz
parent de02569e6b953befd9e068139751d7d21c8bfd18 view | diff
63d692444283c8d1e82efee122f2b46a70f0f073 view | diff
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
1 files added
14 files modified
217 ■■■■■ changed files
install/sql/incremental/upd_0060.sql 8 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 7 ●●●●● diff | view | raw | blame | history
interface/web/client/client_edit.php 39 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 22 ●●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 50 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_reseller.lng 6 ●●●●● diff | view | raw | blame | history
interface/web/client/reseller_edit.php 19 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_address.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_address.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_limits.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_domain.tform.php 22 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_domain.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_domain_advanced.htm 8 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_domain_edit.php 4 ●●● diff | view | raw | blame | history