Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Snippets Groups Projects

1ee36574

Commit 1ee36574 authored 8 years ago by Pascal Dreissen

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/stable-3.1' into stable-3.1

parents 6f582efe f7e9ef76

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

interface/lib/classes/tools_sites.inc.php 1 addition, 1 deletion

interface/lib/classes/tools_sites.inc.php
interface/web/sites/web_childdomain_edit.php 1 addition, 1 deletion

interface/web/sites/web_childdomain_edit.php
server/plugins-available/apache2_plugin.inc.php 1 addition, 0 deletions

server/plugins-available/apache2_plugin.inc.php

with 3 additions and 2 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