Skip to content
Commit ea9a1df1 authored by mark_story's avatar mark_story
Browse files

Merge branch 'master' into 2.1 

Conflicts:
	en/appendices/2-0-migration-guide.rst
	en/core-utility-libraries/set.rst
parents fe2ff9d2 b6f8946c
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment