ISPConfig3 devel
parent: b8f4ca | patch | commitdiff
Marius Burkard
2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade
refs
author Marius Burkard <m.burkard@pixcept.de>
Saturday, January 30, 2016 07:44 -0500
committer Marius Burkard <m.burkard@pixcept.de>
Saturday, January 30, 2016 07:44 -0500
commitf686264ad6d82cfaf4e401da2e259880f57bfade
tree 52097b7e614cb6419874972b7fa2387c9845bc21 tree | zip | gz
parent b8f4caccb73052b9d7488b592ed4854958a4dc76 view | diff
cffef25940ced035a5bf9a4537f1ec31ae31f4b8 view | diff 
Merge branch 'master' into 'stable-3.1'

Master



See merge request !274
2 files modified
42 ■■■■■ changed files
install/update.php 28 ●●●●● diff | view | raw | blame | history
interface/web/dns/templates/dns_dmarc_edit.htm 14 ●●●●● diff | view | raw | blame | history