Skip to content
Commit d5b5d3d8 authored by Marius Cramer's avatar Marius Cramer
Browse files

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
parents 513a1785 f7577711
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment