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

f0b03be2

Commit f0b03be2 authored 9 years ago by Florian Schaal

Downloads
- Plain Diff

Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

Conflicts:
	interface/web/client/form/reseller.tform.php

parents bad4bd31 a713050f

No related branches found

No related tags found

1 merge request!264Master

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

interface/web/sites/shell_user_edit.php 22 additions, 1 deletion

interface/web/sites/shell_user_edit.php
interface/web/sites/templates/shell_user_advanced.htm 21 additions, 15 deletions

interface/web/sites/templates/shell_user_advanced.htm
server/plugins-available/nginx_plugin.inc.php 5 additions, 3 deletions

server/plugins-available/nginx_plugin.inc.php
server/plugins-available/shelluser_base_plugin.inc.php 4 additions, 0 deletions

server/plugins-available/shelluser_base_plugin.inc.php
server/plugins-available/shelluser_jailkit_plugin.inc.php 4 additions, 1 deletion

server/plugins-available/shelluser_jailkit_plugin.inc.php

with 56 additions and 20 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