Skip to content
Snippets Groups Projects
Commit bac23ce4 authored by aspangaro's avatar aspangaro
Browse files

Merge remote-tracking branch 'Upstream/develop' into 5.0-p15 

Conflicts:
	htdocs/commande/class/api_orders.class.php
parents 922495d7 a7db09c0
No related branches found
No related tags found
No related merge requests found
Hide 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.
Finish editing this message first!
Please register or to comment