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

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

Conflicts:
	htdocs/societe/list.php
parents 9bedfc87 c20296f9
Branches
Tags
No related merge requests found
Showing
with 184 additions and 127 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment