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

Merge branch 'master' into 2.1 

Conflicts:
	en/development/debugging.rst
	en/development/testing.rst
parents c2d56fe9 40e19b2a
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