Marius Cramer
2014-01-10 20e01532de8836a941d9a180ee813a607490e087
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, January 10, 2014 10:04 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Friday, January 10, 2014 10:04 -0500
commit20e01532de8836a941d9a180ee813a607490e087
tree 5f08f3fb21aa6bd7391679698df9663d3783a295 tree | zip | gz
parent ddb461f596d9f013afe4f215fabc0eabc62b1fb0 view | diff
2e5b1afd375e1065dfb451281e44a5a172fd2e8b view | diff
Merge branch 'master' of /home/git/repositories/florian030/ispconfig3
9 files modified
45 ■■■■■ changed files
install/tpl/server.ini.master 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/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