Skip to content
Snippets Groups Projects
Commit c29f6910 authored by Juanjo Menent's avatar Juanjo Menent
Browse files

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

# Conflicts:
#	htdocs/fourn/commande/card.php
parents d19ec89b 0016f48f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment