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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into

develop

Conflicts:
	htdocs/compta/bank/annuel.php
parents e382999b 976211b7
No related branches found
No related tags found
No related merge requests found
Showing
with 190 additions and 266 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