Skip to content
Snippets Groups Projects
Commit 65c80f1a authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'patch-1' into 'stable-3.1' 

missing new line at the end of the line causes conflicts with the following line



See merge request !295
parents 9467043d f5895d64
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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