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

Merge remote-tracking branch 'upstream/3.8' into 3.9 

Conflicts:
	htdocs/compta/localtax/quadri_detail.php
parent 2d645c74
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