Skip to content
Commit ea3e02fc authored by Florian Schaal's avatar Florian Schaal
Browse files

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

Conflicts:
	install/sql/incremental/upd_dev_collection.sql
parents 545f7ab7 c8f8fee6
Hide whitespace changes
Inline Side-by-side
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