Skip to content
Snippets Groups Projects
Commit 95f7a7af authored by Matthieu Muffato's avatar Matthieu Muffato
Browse files

Merge branch 'version/2.1' into version/2.2 

* version/2.1:
  cause_of_death can be undefined here (for local meadows, for instance)
parents c49c292b 695cf3b6
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