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

Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 

atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
parents 8e29dcdb 9eed66d9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 766 additions and 12 deletions
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