ISPConfig3 devel
parent: ce6e1d | patch | commitdiff
A. Täffner
2016-01-22 b4263138f9632d3a9c098a9e6ad1fdccee03fcc9
refs
author A. Täffner <darkalex@firesplash.de>
Friday, January 22, 2016 13:18 -0500
committer A. Täffner <darkalex@firesplash.de>
Friday, January 22, 2016 13:18 -0500
commitb4263138f9632d3a9c098a9e6ad1fdccee03fcc9
tree c6500bbaa35202cc7a64b619b4b62f0eb4b0d5e9 tree | zip | gz
parent ce6e1ddfd09c47fc3f80e4fccc238894cf560ddb view | diff
4a63a0b05ba6afce4260e597a7a669ef3ce10545 view | diff 
Merge branch 'dns-dnssec' of git.ispconfig.org:darkalex/ispconfig3 into dns-dnssec

Conflicts:
	install/sql/incremental/upd_dev_collection.sql
changed files