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

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

Conflicts:
	htdocs/core/boxes/box_task.php
	htdocs/core/lib/files.lib.php
parents 8bdda858 4092f5fa
Branches
No related tags 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