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

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

aljawaid-develop

Conflicts:
	htdocs/langs/en_US/agenda.lang
	htdocs/langs/en_US/bills.lang
parents 4bcc7dc8 c2f1826a
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.
Please register or to comment