Skip to content
GitLab
Explore
Sign in
Register
MK
ISPConfig 3
Commits
dbf29d99
Commit
dbf29d99
authored
Jul 01, 2014
by
Marius Cramer
Browse files
Merge branch 'master' of
http://git.ispconfig.org/Cambra/ispconfig3
into Cambra/ispconfig3-master
Conflicts: interface/lib/lang/es.lng
parents
47568c88
5dc7c8f6
Changes
7
Show 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