Skip to content
Snippets Groups Projects
Commit 515fe7d0 authored by Vivien Langhans's avatar Vivien Langhans
Browse files

merge conflict solved, add patches

parent 9f337e15
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 292 additions and 228 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment