Laurent Destailleur e4645cf2c5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/blockedlog/class/blockedlog.class.php
	htdocs/contrat/card.php
	htdocs/societe/card.php

2017-10-27 02:12:35 +02:00

..

index.html

Removed index.php and replaced them with blank index.html as it is more appropriate

2014-07-12 23:18:57 +02:00

productMargins.php

NEW Search filters in lists are restored when using "back to list"

2017-10-03 16:00:52 +02:00

thirdpartyMargins.php

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

2017-10-27 02:12:35 +02:00