Marius Cramer
2013-12-27 6b1d788d1d50fd38f68f152285f3fa816a9d7880
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, December 27, 2013 12:16 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Friday, December 27, 2013 12:16 -0500
commit6b1d788d1d50fd38f68f152285f3fa816a9d7880
tree b4dcab7a8b9910ae8e84d4874487008b8ee243cc tree | zip | gz
parent 5a234a89193bcaaf5b3f7dc1a99bb6c1b10c9df3 view | diff
fbeb11d1d0f491cd4b9a9d730fdc720e758ae26d view | diff
Merge branch 'master' of /home/git/repositories/florian030/ispconfig3
5 files modified
80 ■■■■■ changed files
interface/lib/classes/tform_base.inc.php 59 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 8 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 3 ●●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_web_edit.htm 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 8 ●●●●● diff | view | raw | blame | history