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

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

Conflicts:
	htdocs/expedition/class/expedition.class.php
parents 2266c280 d90b342c
Branches
Tags
No related merge requests found
Showing
with 265 additions and 284 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment