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

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

Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
parents c9ce9555 92990404
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 111 additions and 41 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment