Skip to content
Commit 08b9990c authored by Jose Lorenzo Rodriguez's avatar Jose Lorenzo Rodriguez
Browse files

Merge branch 'master' into 2.1 

Conflicts:
	en/development/rest.rst
parents 97c21984 b0baabbb
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