Skip to content
Commit 58964a90 authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge remote-tracking branch 'florian030/master' 

Conflicts:
	install/sql/incremental/upd_0073.sql
	install/sql/ispconfig3.sql
parents 363ccfed ee23268b
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