ISPConfig3 devel
parent: 65c80f | patch | commitdiff
Marius Burkard
2016-03-14 80c6a7f559ceb100b82921019bab3a0c5ed2ae2a
refs
author Marius Burkard <m.burkard@pixcept.de>
Monday, March 14, 2016 10:59 -0400
committer Marius Burkard <m.burkard@pixcept.de>
Monday, March 14, 2016 10:59 -0400
commit80c6a7f559ceb100b82921019bab3a0c5ed2ae2a
tree 6b8dac8dc01b580ea1e6d74cc7846703e1ea12fa tree | zip | gz
parent 65c80f1a80caed31a3e9322a90b13577fe87496e view | diff
81b7f708335372f9ac4e35b5443ad34d15723ce3 view | diff 
Merge branch 'master' into 'stable-3.1'

fixed dns-import for dmarc and dkim (Fixes #3792)



See merge request !294
1 files modified
154 ■■■■■ changed files
interface/web/dns/dns_import.php 154 ●●●●● diff | view | raw | blame | history