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

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

Conflicts:
	htdocs/core/lib/tax.lib.php
parents 62197631 ddb95e57
No related branches found
No related tags found
No related merge requests found
Showing
with 118 additions and 86 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment