Laurent Destailleur 21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ...

Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php

2019-06-04 19:03:27 +02:00

..

admin

NEW Can choose the root category to show for TakePOS module

2019-03-15 02:12:40 +01:00

class

Fix scrutinizer error

2019-05-02 16:08:58 +02:00

card.php

Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma

2019-01-27 23:23:38 +01:00

edit.php

add oldcopy of category before updating

2019-03-06 18:01:18 +01:00

index.php

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0

2019-06-04 19:03:27 +02:00

photos.php

Look and feel v10

2019-03-15 10:48:10 +01:00

traduction.php

Merge branch 'develop' into nospaceaftercomma

2019-02-03 19:27:16 +01:00

viewcat.php

Look and feel v10

2019-03-15 10:48:10 +01:00