ISPConfig3 devel
parent: 1f5020 | patch | commitdiff
Marius Cramer
2015-07-21 de34a9d7754c9f8b6e8af4334b3950dc886ad064
refs
author Marius Cramer <m.cramer@pixcept.de>
Tuesday, July 21, 2015 04:52 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Tuesday, July 21, 2015 04:52 -0400
commitde34a9d7754c9f8b6e8af4334b3950dc886ad064
tree 5853e12e01a25748629196f436dfff61d5ff6542 tree | zip | gz
parent 1f50209744f36c1602b11a3787dacfd3ea76527e view | diff
ba89388040836aa15764612f4c81b8127238c0c9 view | diff 
Merge branch 'master' into 'master'

Master

See merge request !213
2 files added
2 files modified
168 ■■■■■ changed files
helper_scripts/import_dkim.php 148 ●●●●● diff | view | raw | blame | history
helper_scripts/import_dkim.txt 10 ●●●●● diff | view | raw | blame | history
install/dist/lib/gentoo.lib.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/mysql_clientdb_plugin.inc.php 8 ●●●●● diff | view | raw | blame | history