Commit b1c21981 authored 8 years ago by Laurent Destailleur

Merge remote-tracking branch 'origin/3.9' into develop

Conflicts:
	htdocs/core/ajax/selectsearchbox.php
	htdocs/core/lib/price.lib.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFacture.class.php
	htdocs/projet/list.php
	htdocs/societe/list.php

parents d7f669b9 39b61d69

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 315 additions and 260 deletions

Please register or to comment