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

Merge branch 'renky/ispconfig3-master'

Conflicts:
	interface/web/mail/templates/mail_user_backup_list.htm
parents f3f4aa5c f42d9169
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