Skip to content
GitLab
Commit c0916cc6 authored by Nicolau Manubens's avatar Nicolau Manubens
Browse files

Solved merge conflicts with latest master version (2.4.11).

parents 81223b86 eb2f307e
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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