Skip to content
GitLab
Explore
Sign in
Register
chp
ISPConfig 3
Commits
82cf1e84
Commit
82cf1e84
authored
Jan 21, 2015
by
Marius Cramer
Browse files
Merge branch 'renky/ispconfig3-master'
Conflicts: interface/web/mail/templates/mail_user_backup_list.htm
parents
f3f4aa5c
f42d9169
Changes
38
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment