ISPConfig3 devel
parent: c56175 | patch | commitdiff
Marius Cramer
2014-08-14 fef8248f430365a100bd585196ef7cdc04e5c131
refs
author Marius Cramer <m.cramer@pixcept.de>
Thursday, August 14, 2014 07:56 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Thursday, August 14, 2014 07:56 -0400
commitfef8248f430365a100bd585196ef7cdc04e5c131
tree 4a229dfbef0e849aa61956e3f29ee6bbc3c75481 tree | zip | gz
parent c56175b5781ee8a20bebe3015bcbe8ea68b9c8b7 view | diff
165399547143a2c88d1546a814370ccef79ddfb6 view | diff 
Merge branch 'master' into 'master'

Master

See merge request !119
2 files modified
108 ■■■■■ changed files
interface/web/mail/mail_domain_edit.php 94 ●●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin_dkim.inc.php 14 ●●●●● diff | view | raw | blame | history