Skip to content
Snippets Groups Projects
Commit 4ec300e11e5f authored by Jeff Forcier's avatar Jeff Forcier
Browse files

Merge branch '1.11' into 1.12 

Conflicts:
	NEWS
parents 034a53cab5df 45eebb7ea9ae
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment