Skip to content
Commit fc91b068 authored by Grazyna Jaworska's avatar Grazyna Jaworska
Browse files

Merge remote-tracking branch 'origin/7.x-3.x' into 2.4.x-dev 

Conflicts:
	platform/provision_welcome_mail.inc
parents c2409ada 1829b192
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment