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

Merge branch 'develop' of https://github.com/fappels/dolibarr into fappels-develop 

Conflicts:
	htdocs/langs/en_US/sendings.lang
parents b3fc8d29 c5599efe
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment