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

Merge remote-tracking branch 'origin/3.7' into 3.8 

Conflicts:
	build/makepack-howto.txt
	htdocs/filefunc.inc.php
parents 46d122c4 06754068
No related branches found
No related tags found
No related merge requests found
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