Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

ISPConfig 3
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

18fa2e2b

Commit 18fa2e2b authored 10 years ago by Till Brehm

Downloads
- Plain Diff

Merge branch 'stable-3.0.5' of git.ispconfig.org:ispconfig/ispconfig3 into stable-3.0.5

parents 85f6fb3a c5541531

No related branches found

No related tags found

1 merge request!92Stable 3.0.5

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

install/tpl/nginx_apps.vhost.master 1 addition, 1 deletion

install/tpl/nginx_apps.vhost.master
interface/web/login/templates/index.htm 4 additions, 1 deletion

interface/web/login/templates/index.htm
interface/web/themes/blue/templates/main.tpl.htm 1 addition, 1 deletion

interface/web/themes/blue/templates/main.tpl.htm
interface/web/themes/default/templates/main.tpl.htm 1 addition, 1 deletion

interface/web/themes/default/templates/main.tpl.htm
server/conf/nginx_apps.vhost.master 1 addition, 1 deletion

server/conf/nginx_apps.vhost.master
server/mods-available/web_module.inc.php 5 additions, 0 deletions

server/mods-available/web_module.inc.php

with 13 additions and 5 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment