Marius Cramer
2014-01-22 6a7cf709e1ce42469ff61b28832905aec6a7100c
refs
author Marius Cramer <m.cramer@pixcept.de>
Wednesday, January 22, 2014 11:31 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Wednesday, January 22, 2014 11:31 -0500
commit6a7cf709e1ce42469ff61b28832905aec6a7100c
tree 01d590fafe469aa5a8465f8bf10fdd893ab840b2 tree | zip | gz
parent 09549a202289196936c9c6a48307e2915a51de64 view | diff
b52e4f777bcdb4729cd5c6326aa5ae4669e9beae view | diff
Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3
11 files modified
65 ■■■■■ changed files
install/tpl/server.ini.master 1 ●●●● diff | view | raw | blame | history
interface/lib/classes/tform_base.inc.php 1 ●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 6 ●●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/de_server_config.lng 1 ●●●● diff | view | raw | blame | history
interface/web/admin/lib/lang/en_server_config.lng 1 ●●●● diff | view | raw | blame | history
interface/web/admin/templates/server_config_server_edit.htm 6 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/100-monitor_clamav_log.inc.php 19 ●●●●● diff | view | raw | blame | history
server/lib/classes/cron.d/500-backup.inc.php 2 ●●● diff | view | raw | blame | history
server/lib/classes/cron.d/500-backup_mail.inc.php 21 ●●●● diff | view | raw | blame | history
server/plugins-available/apache2_plugin.inc.php 2 ●●● diff | view | raw | blame | history
server/plugins-available/mail_plugin.inc.php 5 ●●●●● diff | view | raw | blame | history