Skip to content
Snippets Groups Projects
Commit 0921795c authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'v2.0-fix-manual' into fix-manual 

Conflicts:
	patches/patch.sh
parents e1d01e84 940f0ec1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 1 deletion
patches/patch.sh
+ 0
− 1
View file @ 0921795c
......@@ -56,7 +56,6 @@ otherfiles=
save_originals=
quiet=
for option
do
......
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