Skip to content
GitLab
Explore
Sign in
Commit
5fe87373
authored
Oct 21, 2012
by
Vojtech Juranek
Browse files
Doing 'ours' merge to absorb the previous stable branch
parents
4d3185ec
eccd1450
Changes
0
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