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

48f2ae57

Commit 48f2ae57 authored 4 years ago by Marius Burkard

Downloads
- Plain Diff

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

parents 6c638517 5dece6ef

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

interface/lib/classes/remoting_lib.inc.php 8 additions, 1 deletion

interface/lib/classes/remoting_lib.inc.php
interface/web/dns/dns_spf_edit.php 1 addition, 1 deletion

interface/web/dns/dns_spf_edit.php
remoting_client/examples/ispc-import-csv-email.php 305 additions, 0 deletions

remoting_client/examples/ispc-import-csv-email.php
server/conf/php_fpm_pool.conf.master 0 additions, 1 deletion

server/conf/php_fpm_pool.conf.master
server/plugins-available/z_php_fpm_incron_reload_plugin.inc.php 12 additions, 2 deletions

.../plugins-available/z_php_fpm_incron_reload_plugin.inc.php

with 326 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