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

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

Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
parents 42898cd4 5871d59d
No related branches found
No related tags found
No related merge requests found
Showing
with 186 additions and 125 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment