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

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

Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/class/hookmanager.class.php
	htdocs/langs/fr_FR/holiday.lang
parents 9b072714 6b8c4fc3
No related branches found
No related tags found
No related merge requests found
Showing
with 94 additions and 51 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment