Skip to content
Snippets Groups Projects
Commit e11bf6fe authored by Giovanni Bussi's avatar Giovanni Bussi
Browse files

Merge branch 'munster' into v2.1 

[makedoc]

Conflicts:
	user-doc/figs/belfast-2-ala.png
	user-doc/figs/belfast-2-transition.png

(these figures were shrinked in both munster and cambridge branches)
parents 025d9217 d64b782d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1120 additions and 6 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