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

89d62098

Commit 89d62098 authored 5 years ago by Marius Burkard

Downloads
- Plain Diff

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

parents 7fca6989 3c1d0a65

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

install/lib/installer_base.lib.php 1 addition, 1 deletion

install/lib/installer_base.lib.php
interface/lib/classes/listform_actions.inc.php 11 additions, 1 deletion

interface/lib/classes/listform_actions.inc.php
interface/web/mail/list/user_quota_stats.list.php 1 addition, 1 deletion

interface/web/mail/list/user_quota_stats.list.php
interface/web/mail/mail_user_edit.php 3 additions, 0 deletions

interface/web/mail/mail_user_edit.php
interface/web/mail/templates/user_quota_stats_list.htm 2 additions, 2 deletions

interface/web/mail/templates/user_quota_stats_list.htm
interface/web/sites/database_quota_stats.php 3 additions, 3 deletions

interface/web/sites/database_quota_stats.php
interface/web/themes/default/templates/main.tpl.htm 4 additions, 4 deletions

interface/web/themes/default/templates/main.tpl.htm

with 25 additions and 12 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