Skip to content
Commit 5cbfd762 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'develop' of git.ispconfig.org:ispconfig/ispconfig3 into develop

parents 709789a4 92fc3734
Pipeline #5476 passed with stage
in 13 seconds
Hide whitespace changes
Inline Side-by-side
  • Thom 🛠 @thom ·
    Developer

    @tbrehm changes from other MR's are included in this MR, maybe your branch was not up to date?

  • Till Brehm @tbrehm ·
    Author Owner

    That should be ok, the resulting files in GIT are all fine.

  • Thom 🛠 @thom ·
    Developer

    Alright, didn't check that yet.

0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment