Skip to content
Commit 78939c8c authored by Philippe Mouchel's avatar Philippe Mouchel
Browse files

Merge branch '2.x' into 'bug/use-prompted-var-to-install-site-with-a-specified-language' 

# Conflicts:
#   README.adoc
parents acacd0d6 4b32c038
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment