Skip to content
GitLab
Explore
Sign in
SDK
Umbrello
Commits
f235b713
Commit
f235b713
authored
Dec 29, 2014
by
Andi Fischer
Browse files
Conflict resolution after merge with master.
parents
a5ae9378
4d8eb739
Changes
61
Expand all
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