Skip to content
Commit 0a486dd0 authored by Mark Story's avatar Mark Story
Browse files

Merge branch 'master' into 2.1 

Conflicts:
	en/console-and-shells/upgrade-shell.rst
parents 0ba2bbe8 f52a40a3
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