ISPConfig3 devel
parent: b3ada5 | patch | commitdiff
Marius Cramer
2015-09-18 5cc181a90f7d27f4ec578a8a892b4dd0ca44adf4
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, September 18, 2015 03:09 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Friday, September 18, 2015 03:09 -0400
commit5cc181a90f7d27f4ec578a8a892b4dd0ca44adf4
tree 58d46fbf6762f8297a4e1a207b3750fcb32bc570 tree | zip | gz
parent b3ada5210398434515ef9fa6acfd223b501ca495 view | diff
7c980c30d5f75c63005d8c4f69f6c080e53cafed view | diff 
Merge branch 'master' into 'master'

Master

See merge request !230
3 files modified
45 ■■■■■ changed files
install/dist/tpl/gentoo/amavisd-ispconfig.conf.master 18 ●●●●● diff | view | raw | blame | history
install/tpl/amavisd_user_config.master 17 ●●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin_dkim.inc.php 10 ●●●●● diff | view | raw | blame | history