Till Brehm
2014-05-02 18fa2e2b8bcf10091fdc8e2079a1ff76c173ec84
refs
author Till Brehm <tbrehm@ispconfig.org>
Friday, May 2, 2014 06:40 -0400
committer Till Brehm <tbrehm@ispconfig.org>
Friday, May 2, 2014 06:40 -0400
commit18fa2e2b8bcf10091fdc8e2079a1ff76c173ec84
tree 34b408d9f436aac58bc66531b06448a0e319ef4c tree | zip | gz
parent 85f6fb3a343bc9287c5ea0488eb97c850ad58eab view | diff
c5541531e73189bac0ab3d8dd119834f1f013926 view | diff
Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5
6 files modified
18 ■■■■ changed files
install/tpl/nginx_apps.vhost.master 2 ●●● diff | view | raw | blame | history
interface/web/login/templates/index.htm 5 ●●●● diff | view | raw | blame | history
interface/web/themes/blue/templates/main.tpl.htm 2 ●●● diff | view | raw | blame | history
interface/web/themes/default/templates/main.tpl.htm 2 ●●● diff | view | raw | blame | history
server/conf/nginx_apps.vhost.master 2 ●●● diff | view | raw | blame | history
server/mods-available/web_module.inc.php 5 ●●●●● diff | view | raw | blame | history