Skip to content
Commit 4551c9d4 authored by Òscar Casajuana's avatar Òscar Casajuana
Browse files

Merge remote-tracking branch 'docs/3.0' into spanish-translation-notes 

Conflicts:
	es/index.rst
parents e9d0887d 3c233602
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