Commit 3d326362 authored by Knut's avatar Knut

Merge branch 'bottfric' into bdy_2d

Conflicts:
	src/2d/variables_2d.F90
parents 45df881f 07879521
Pipeline #132 failed with stages