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

8ddcb0d7

Commit 8ddcb0d7 authored 11 years ago by Marius Cramer

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/stable-3.0.5'

Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/sites/web_vhost_subdomain_edit.php
	server/plugins-available/cron_plugin.inc.php

parents 05481a4f c9262595

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

install/dist/lib/opensuse.lib.php 1 addition, 1 deletion

install/dist/lib/opensuse.lib.php
install/dist/tpl/gentoo/apache_apps.vhost.master 2 additions, 2 deletions

install/dist/tpl/gentoo/apache_apps.vhost.master
install/dist/tpl/gentoo/apache_ispconfig.vhost.master 2 additions, 2 deletions

install/dist/tpl/gentoo/apache_ispconfig.vhost.master
install/sql/incremental/upd_0068.sql 4 additions, 3 deletions

install/sql/incremental/upd_0068.sql
install/tpl/apache_apps.vhost.master 2 additions, 2 deletions

install/tpl/apache_apps.vhost.master
install/tpl/apache_ispconfig.vhost.master 2 additions, 2 deletions

install/tpl/apache_ispconfig.vhost.master
interface/web/client/form/domain.tform.php 1 addition, 1 deletion

interface/web/client/form/domain.tform.php
server/conf/apache_apps.vhost.master 1 addition, 1 deletion

server/conf/apache_apps.vhost.master
server/conf/vhost.conf.master 2 additions, 2 deletions

server/conf/vhost.conf.master
server/plugins-available/cron_plugin.inc.php 4 additions, 0 deletions

server/plugins-available/cron_plugin.inc.php

with 21 additions and 16 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