Merge branch 'stable' into upstream-master

  • [feedquote='i-MSCP Github (nuxwin)','https://github.com/i-MSCP/imscp/commit/e3a4f4ff5a9debb8dac48badd8ffd80b09828775']

    Code
    1. Merge branch 'stable' into upstream-master
    2. Conflicts:
    3. CHANGELOG
    4. configs/debian/imscp.conf
    5. configs/ubuntu/imscp.conf
    6. docs/Debian/INSTALL
    7. docs/Ubuntu/INSTALL

    [/feedquote]