interface/web/dns/dns_import.php · a67681db7914d94f5e1956bd9ffdb9f882f0a2cb · Helmo / ISPConfig 3

Source project has a limited visibility.

10 years ago

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

Marius Cramer authored 10 years ago

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

Conflicts:
	install/sql/incremental/upd_dev_collection.sql

adb0e74c

History

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

Marius Cramer authored 10 years ago

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

Conflicts:
	install/sql/incremental/upd_dev_collection.sql