Skip to content
Snippets Groups Projects
Commit e99883f1 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.4' into 3.5 

Conflicts:
	htdocs/admin/modules.php
parents ab7a17fe 5b63b561
No related branches found
No related tags found
No related merge requests found
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