Skip to content
Snippets Groups Projects
Commit e6366b21 authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

Merge branch 'feature/3pwateroil-on-next' into 'next' 

[3pwateroil] port model and test

See merge request !681
parents 07473b39 8505c07a
No related branches found
No related tags found
2 merge requests!681[3pwateroil] port model and test,!617[WIP] Next
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1226 additions and 1927 deletions
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