ISPConfig3 devel
parent: 513a17 | patch | commitdiff
Marius Cramer
2015-01-09 d5b5d3d8fc4ce9380653d6ff60ae8b678e858433
refs
author Marius Cramer <m.cramer@pixcept.de>
Friday, January 9, 2015 11:15 -0500
committer Marius Cramer <m.cramer@pixcept.de>
Friday, January 9, 2015 11:15 -0500
commitd5b5d3d8fc4ce9380653d6ff60ae8b678e858433
tree 60268a8ebbeceb9ecaa45d5f038f94f2545b368e tree | zip | gz
parent 513a1785121fe98ced58bb0713885926a1ee42a9 view | diff
f757771128c7c9414a35ac2743ff123934a8b211 view | diff 
Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Conflicts:
	interface/lib/classes/plugin_backuplist.inc.php
	interface/web/sites/templates/web_backup_list.htm
3 files modified
38 ■■■■■ changed files
interface/lib/classes/plugin_backuplist.inc.php 30 ●●●●● diff | view | raw | blame | history
interface/web/sites/templates/web_backup_list.htm 4 ●●●●● diff | view | raw | blame | history
server/plugins-available/backup_plugin.inc.php 4 ●●●●● diff | view | raw | blame | history