ISPConfig3 devel
parent: cab4ba | patch | commitdiff
Marius Cramer
2015-03-31 e146fe8cebdf9201ccd67b37333a6c423ac5c1f4
refs
author Marius Cramer <m.cramer@pixcept.de>
Tuesday, March 31, 2015 05:36 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Tuesday, March 31, 2015 05:36 -0400
commite146fe8cebdf9201ccd67b37333a6c423ac5c1f4
tree fdb2d3014e5549145360928aed47a126c9bfa78e tree | zip | gz
parent cab4ba3af9dfd02c303d3b4714700269133f35bf view | diff
d9bc89270c2dd5da239338128acd1a559ff6a5f5 view | diff 
Merge branch 'master' into 'master'

Master

See merge request !173
3 files modified
6 ■■■■■ changed files
interface/web/dns/form/dns_cname.tform.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/backup_plugin.inc.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin_dkim.inc.php 2 ●●●●● diff | view | raw | blame | history