ISPConfig3 devel
parent: dfadc8 | patch | commitdiff
Marius Burkard
2016-02-12 8aa7d1f70a5c8b036f0bf519ebea0426f5b13bd1
refs
author Marius Burkard <m.burkard@pixcept.de>
Friday, February 12, 2016 06:23 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Friday, February 12, 2016 06:23 -0500
commit8aa7d1f70a5c8b036f0bf519ebea0426f5b13bd1
tree 94566770c8a9e69521342fc80b97309d1c348c77 tree | zip | gz
parent dfadc85817ae71a7a9bff48ae74bb7293df0d58e view | diff
67b0cb394d6b89b19087c285765285806e7da95c view | diff 
Merge branch 'stable-3.1'
19 files modified
111 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 7 ●●●●● diff | view | raw | blame | history
install/sql/ispconfig3.sql 2 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client.tform.php 12 ●●●●● diff | view | raw | blame | history
interface/web/client/form/client_template.tform.php 12 ●●●●● diff | view | raw | blame | history
interface/web/client/form/reseller.tform.php 12 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_client_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/de_reseller.lng 2 ●●●●● 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_client_template.lng 2 ●●●●● diff | view | raw | blame | history
interface/web/client/lib/lang/en_reseller.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_edit_limits.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/client_template_edit_limits.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/client/templates/reseller_edit_limits.htm 12 ●●●●● diff | view | raw | blame | history
interface/web/sites/form/web_vhost_domain.tform.php 3 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/de_web_vhost_domain.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_domain.lng 1 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_vhost_domain_edit.htm 6 ●●●●● diff | view | raw | blame | history
interface/web/sites/web_vhost_domain_edit.php 6 ●●●●● diff | view | raw | blame | history