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

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

Conflicts:
	htdocs/societe/consumption.php
parents e0cef696 9f3f4778
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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