Skip to content
GitLab
Explore
Sign in
Commit
3684b83d
authored
Apr 17, 2015
by
Maximiliano Curia
Browse files
Merge commit '
081764e8
'
Conflicts: debian/control debian/libkf5kiocore5.symbols debian/patches/series
parents
90e8f05a
081764e8
Loading
Loading
Loading
Changes
4
Hide 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