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

Merge branch 'favourite_servers' of http://git.ispconfig.org/Cambra/ispconfig3...

Merge branch 'favourite_servers' of http://git.ispconfig.org/Cambra/ispconfig3 into Cambra/ispconfig3-favourite_servers

Conflicts:
	install/sql/incremental/upd_dev_collection.sql
parents cbdc7aca 726f15c4
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