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

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

Conflicts:
	htdocs/core/modules/propale/mod_propale_marbre.php
parents b3962728 4a7e9e4d
No related branches found
No related tags found
No related merge requests found
Showing
with 109 additions and 73 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment