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

Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php

2017-09-12 13:26:25 +02:00

..

admin

FIX #7146

2017-07-13 15:16:17 +02:00

class

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

2017-09-12 13:26:25 +02:00

card.php

Look and feel v6

2017-06-21 11:37:34 +02:00

edit.php

FIX #6985

2017-06-11 10:37:58 +02:00

index.php

Fix regression on categories

2017-08-27 12:28:59 +02:00

photos.php

FIX #7072

2017-07-25 19:57:51 +02:00

traduction.php

FIX #7072

2017-07-25 19:57:51 +02:00

viewcat.php

FIX #7072

2017-07-25 19:57:51 +02:00