ISPConfig3 devel
parent: 579634 | patch | commitdiff
Marius Cramer
2015-09-04 842b5c34e70869b7b1a0d368cbb6280f737301d3
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, September 4, 2015 08:56 -0400
committer Marius Cramer <m.cramer@pixcept.de>
Friday, September 4, 2015 08:56 -0400
commit842b5c34e70869b7b1a0d368cbb6280f737301d3
tree 242b94b3a17c0359a1e77185fe24d1566bae958c tree | zip | gz
parent 57963434331b48627cc2a0bfcff3924b0112995e view | diff
d6cd11df635941a4e7d35e6e45b4e59cb8bd4469 view | diff 
Merge branch 'master' into 'master'

Master

See merge request !225
5 files modified
19 ■■■■■ changed files
install/tpl/server.ini.master 2 ●●●●● diff | view | raw | blame | history
interface/web/admin/form/server_config.tform.php 4 ●●●●● 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 2 ●●●●● diff | view | raw | blame | history
server/plugins-available/backup_plugin.inc.php 9 ●●●●● diff | view | raw | blame | history