ISPConfig3 devel
parent: 4e52e1 | patch | commitdiff
Marius Cramer
2014-10-29 871298f2b5dc76c4bdc8501464aeeeaa5a44677e
refs
author Marius Cramer <m.cramer@pixcept.de>
Wednesday, October 29, 2014 06:05 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Wednesday, October 29, 2014 06:05 -0400
commit871298f2b5dc76c4bdc8501464aeeeaa5a44677e
tree b2f189fd219fed12be0f4e8225e132cd10922e54 tree | zip | gz
parent 4e52e111c859bc586d0379c7cda59111555c9ac0 view | diff
9514971687b22a80bef27ab49e46e689ad69d165 view | diff 
Merge branch 'master' into 'master'

Master

See merge request !134
2 files modified
13 ■■■■■ changed files
interface/web/tools/resync_do.php 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin_dkim.inc.php 11 ●●●●● diff | view | raw | blame | history