Skip to content
Snippets Groups Projects
Commit 284a0f0c authored by Federico Montesino Pouzols's avatar Federico Montesino Pouzols
Browse files

Merge remote-tracking branch 'origin/master' into...

Merge remote-tracking branch 'origin/master' into bugfix/5805_trying_to_load_a_bad_file_causes_segfault
parents 438666ff 19a94d49
No related branches found
No related tags found
No related merge requests found
Showing
with 338 additions and 3792 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment