Marius Cramer
2014-08-11 587fe4ed3539ea05126c8dc7bac27bcf2cab8302
refs
author Marius Cramer <m.cramer@pixcept.de>
Monday, August 11, 2014 06:35 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Monday, August 11, 2014 06:35 -0400
commit587fe4ed3539ea05126c8dc7bac27bcf2cab8302
tree bf1578ef946f70fa674b621c2ee52c900f88d51c tree | zip | gz
parent 9d9ea6f6d55cfb018e1cbfe9d96c1ae67390069d view | diff
28b52633b3eb803e61b314373a307b04bbf91136 view | diff
Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
9 files modified
63 ■■■■ changed files
docs/Remote_API_docs.txt 2 ●●● diff | view | raw | blame | history
interface/lib/classes/tools_sites.inc.php 6 ●●●● diff | view | raw | blame | history
interface/web/mail/mail_domain_dkim_create.php 6 ●●●● diff | view | raw | blame | history
interface/web/sites/database_edit.php 6 ●●●● diff | view | raw | blame | history
interface/web/sites/database_user_edit.php 7 ●●●● diff | view | raw | blame | history
interface/web/sites/ftp_user_edit.php 6 ●●●● diff | view | raw | blame | history
interface/web/sites/shell_user_edit.php 6 ●●●● diff | view | raw | blame | history
interface/web/sites/webdav_user_edit.php 6 ●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin_dkim.inc.php 18 ●●●● diff | view | raw | blame | history