Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

I

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

Snippets Groups Projects

ea3e02fc

Commit ea3e02fc authored 7 years ago by Florian Schaal

Downloads
- Plain Diff

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

Conflicts:
	install/sql/incremental/upd_dev_collection.sql

parents 545f7ab7 c8f8fee6

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

install/patches/upd_0085.php 59 additions, 0 deletions

install/patches/upd_0085.php
install/sql/incremental/upd_0085.sql 21 additions, 0 deletions

install/sql/incremental/upd_0085.sql
install/sql/incremental/upd_dev_collection.sql 0 additions, 21 deletions

install/sql/incremental/upd_dev_collection.sql
interface/lib/classes/validate_cron.inc.php 3 additions, 0 deletions

interface/lib/classes/validate_cron.inc.php
server/plugins-available/cron_plugin.inc.php 5 additions, 0 deletions

server/plugins-available/cron_plugin.inc.php

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