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

Merge branch 'master' into 2.6 

Conflicts:
	en/core-libraries/helpers/form.rst
parents 15aba57e 3252bc0a
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