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

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

Conflicts:
	htdocs/compta/bank/treso.php
parents c8fe538d 1b24356e
Branches master
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment