Merge branch 'stable-3.1' of https://git.ispconfig.org/ispconfig/ispconfig3 into stable-3.1
Conflicts: install/sql/incremental/upd_dev_collection.sql
Please register or sign in to comment
Conflicts: install/sql/incremental/upd_dev_collection.sql