Skip to content
Snippets Groups Projects
Commit 4cad47d0 authored by sergio's avatar sergio
Browse files

Merge branch 'master' into pairPatchAgglomeration

Conflicts:
	applications/solvers/lagrangian/steadyReactingParcelFoam/pEqn.H
parents 6b1adaf5 9cd5d4ec
Branches
Tags
No related merge requests found
Showing
with 234 additions and 473 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