Skip to content
GitLab
Explore
Sign in
Register
Commit
06cb57f4
authored
Jul 29, 2016
by
Till Brehm
Browse files
Merge branch 'master' into 'stable-3.1'
fix different servers for reseller (
#4056
) See merge request
!392
parents
0418dd9d
c7e1d1b2
Loading
Loading
Loading
Changes
3
Show whitespace changes
Inline
Side-by-side
Loading
Preview
0%
Loading
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